Commit Graph

  • 3ddd4121db update payment report Aung Myo 2017-11-30 17:24:15 +06:30
  • 5b9182c1d1 update rounding adj Aung Myo 2017-11-30 15:44:48 +06:30
  • a871bf3789 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui Aung Myo 2017-11-30 12:05:28 +06:30
  • 6cb7c1e0c4 update rounding adj Aung Myo 2017-11-30 12:05:01 +06:30
  • d15be90a9e Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant Yan 2017-11-30 11:24:24 +06:30
  • 3c2bf42022 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant Yan 2017-11-30 11:23:59 +06:30
  • de9701100d to_i to to_f in shift Yan 2017-11-30 11:23:44 +06:30
  • 7ce71a1960 update inventory hide and cancan update Aung Myo 2017-11-30 11:19:15 +06:30
  • 0af1e5997f remove blank in account type phyusin 2017-11-30 11:18:08 +06:30
  • 67db27e35a Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui Aung Myo 2017-11-30 09:35:49 +06:30
  • b3dae8c018 update paymentreport index Aung Myo 2017-11-30 09:34:51 +06:30
  • e4bebc2ca4 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant Yan 2017-11-29 18:26:35 +06:30
  • 313f745b6a Merge branch 'license' Yan 2017-11-29 18:07:27 +06:30
  • d826e375b7 change license Yan 2017-11-29 18:01:51 +06:30
  • e2aa1527ca license activate Yan 2017-11-29 18:00:13 +06:30
  • 29fa95d229 license activate Yan 2017-11-29 17:59:46 +06:30
  • ec1a8b6fc6 change card sale data in dashboard phyusin 2017-11-29 16:35:59 +06:30
  • fec318db07 change width for close cashier pdf phyusin 2017-11-29 16:04:31 +06:30
  • 31ec2f959b change JCB and Master in close cashier pdf phyusin 2017-11-29 14:47:23 +06:30
  • ea93de084e add font size for Total & Net Sales in close cashier and change closed time in transacctions phyusin 2017-11-29 14:11:56 +06:30
  • c2d2dd7db5 remove rounding adj: in total for close cashier pdf phyusin 2017-11-29 13:54:48 +06:30
  • 3e5fc00da9 change bold in close cashier phyusin 2017-11-29 13:42:33 +06:30
  • 75ee51fd9f change close cashier pdf and card sale in dashboard phyusin 2017-11-29 13:34:03 +06:30
  • a759cda7c6 update daily sale report Aung Myo 2017-11-29 11:56:31 +06:30
  • 92c8e65e11 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2017-11-29 11:50:08 +06:30
  • a1deab2b5e sale item Yan 2017-11-29 11:36:31 +06:30
  • 7740ab6ff7 add item instance code in sale item update Yan 2017-11-29 11:22:54 +06:30
  • b1d9027d5b subdomain + domain Yan 2017-11-29 11:21:26 +06:30
  • 9bbdb22bfb Merge branch 'master' into license Yan 2017-11-29 10:20:27 +06:30
  • 11c6fb2868 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2017-11-29 09:39:24 +06:30
  • f29a5b95a4 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant Yan 2017-11-28 19:12:02 +06:30
  • 900efb3fa6 update report Aung Myo 2017-11-28 19:11:19 +06:30
  • 51df43de44 remove paymal token in seed Yan 2017-11-28 18:43:34 +06:30
  • b394643991 license Yan 2017-11-28 18:10:17 +06:30
  • 5cfebe480f add date margin-left css in origami phyusin 2017-11-28 17:21:13 +06:30
  • f33be9e707 Merge branch 'master' into license Yan 2017-11-28 17:07:58 +06:30
  • 0b03c243ec is card true to string Yan 2017-11-28 17:06:46 +06:30
  • 6cae1b613c javascript is card true Yan 2017-11-28 16:47:12 +06:30
  • 93db6130a1 some wrong in memberdiscount and no pay if any card payment Yan 2017-11-28 15:57:19 +06:30
  • 2e1ba833e8 remove recent amount in credit payment index Yan 2017-11-28 15:05:02 +06:30
  • 009e600c87 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant Yan 2017-11-28 15:02:34 +06:30
  • ab337a3b8a add css for logout icon phyusin 2017-11-28 15:01:58 +06:30
  • ce5c7e4715 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant Yan 2017-11-28 14:58:16 +06:30
  • 442681c3a0 remove comment from void controler Yan 2017-11-28 14:57:58 +06:30
  • f669101d3c remove blank in collection select for menu item and menu item instance phyusin 2017-11-28 14:57:18 +06:30
  • 606e3392c3 remove conflict data phyusin 2017-11-28 14:52:57 +06:30
  • 144aea94c7 remove comment Yan 2017-11-28 14:41:27 +06:30
  • 785541e438 change report filter UI and check focus for datepicker phyusin 2017-11-28 14:16:25 +06:30
  • dd99b50419 add focus input first all backend form Yan 2017-11-28 11:41:47 +06:30
  • 5740bb68fd Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant Yan 2017-11-28 11:38:31 +06:30
  • 494d90c111 order item edit and print Yan 2017-11-28 11:38:08 +06:30
  • ec26c353d2 add first input focus in application js phyusin 2017-11-28 11:35:28 +06:30
  • 989ce16a23 dailysale report UI phyusin 2017-11-28 11:03:29 +06:30
  • 8b6e909220 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant Yan 2017-11-27 19:42:16 +06:30
  • 4192a94d47 check print copy greater than 0 in print_settings phyusin 2017-11-27 19:33:18 +06:30
  • e5746b902b update for print copies for printer_worker.rb Yan 2017-11-27 19:03:50 +06:30
  • ad34002789 change query for transactions/order and transactions/bookings, transactions/credit phyusin 2017-11-27 18:16:46 +06:30
  • 7a28dc1ddc Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant Yan 2017-11-27 17:50:06 +06:30
  • 0c084a1816 credit payment fix when visa assign Yan 2017-11-27 14:24:34 +06:30
  • 20d580b2ab update foc and void for authorized Aung Myo 2017-11-27 13:54:21 +06:30
  • 9ad9e9ae57 change select box for item attribute in menu item instance and button UI for CRM/Queue phyusin 2017-11-27 13:33:20 +06:30
  • 98be8b37a4 change Logout UI phyusin 2017-11-27 09:55:17 +06:30
  • c170974224 change promotion with menu item and menu item instance phyusin 2017-11-27 09:23:10 +06:30
  • 87a27250b7 fix minus addorder.js and void and other origami Yan 2017-11-26 22:23:37 +06:30
  • 6eb3d9399e Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant Yan 2017-11-26 14:40:45 +06:30
  • 9226a7b18d only show instance attribute in menu item selected Yan 2017-11-26 14:40:01 +06:30
  • 74a9166620 update fixed conflicx Aung Myo 2017-11-25 16:51:11 +06:30
  • 2ebecc2fb2 update reports Aung Myo 2017-11-25 16:32:30 +06:30
  • 7140df5bf8 remove comment in sale item Yan 2017-11-24 19:27:05 +06:30
  • b611fcde97 update sale item report Aung Myo 2017-11-24 19:15:59 +06:30
  • ef09042450 update sale item report Aung Myo 2017-11-24 19:12:33 +06:30
  • 3809413a6f Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant Yan 2017-11-24 19:04:55 +06:30
  • 6aed8f89c5 update sale item report Aung Myo 2017-11-24 19:03:53 +06:30
  • b49f46a5c2 update sale item report Aung Myo 2017-11-24 18:57:01 +06:30
  • 5beb427dfe Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant Yan 2017-11-24 13:12:16 +06:30
  • 2341b6f223 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant Yan 2017-11-24 13:11:59 +06:30
  • efb13024b4 add plus sign qty Yan 2017-11-24 13:11:42 +06:30
  • 479a6b5a61 update search data in transaction Aung Myo 2017-11-24 13:09:22 +06:30
  • 1bbeba8485 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2017-11-24 11:56:23 +06:30
  • cb8aa0c8c9 change UI for other payment phyusin 2017-11-24 11:56:06 +06:30
  • a34706dd49 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant Yan 2017-11-24 10:43:14 +06:30
  • b8df371a93 update addorder Aung Myo 2017-11-24 10:42:18 +06:30
  • 80734b3642 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant Yan 2017-11-24 10:41:40 +06:30
  • 7c977e8423 amount_due >= 0 for grand total 0 Yan 2017-11-24 10:41:21 +06:30
  • c4e9abbf19 amount_due >= 0 for grand total 0 Yan 2017-11-24 10:40:52 +06:30
  • 8277473185 change UI for sale_edit and customer in origami phyusin 2017-11-24 10:32:31 +06:30
  • a5a33b269a Merge branch 'master' into license Yan 2017-11-24 10:15:37 +06:30
  • 8a1518558b Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2017-11-24 09:38:48 +06:30
  • ca93f50fdf Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant Yan 2017-11-23 19:02:03 +06:30
  • 7c39f8f7eb update addorder Aung Myo 2017-11-23 19:01:06 +06:30
  • d87adb2dde Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2017-11-23 18:24:24 +06:30
  • 1b06f3ec90 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant Yan 2017-11-23 18:24:22 +06:30
  • 6a4acb71e8 change UI for promotions phyusin 2017-11-23 18:24:01 +06:30
  • 840b0fc4fb Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant Yan 2017-11-23 18:12:27 +06:30
  • 25e9253fee substract total_amount - overall discount in shift sale Yan 2017-11-23 18:12:07 +06:30
  • d78ba65675 update addorder and wrong tax Aung Myo 2017-11-23 17:34:31 +06:30
  • be5b3db619 uncomment void check completed Yan 2017-11-23 17:10:58 +06:30
  • acdefef6db add jquery-ui for autocomplete in CRM phyusin 2017-11-23 15:58:55 +06:30
  • 3d99714dfc Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes phyusin 2017-11-23 14:01:06 +06:30
  • 200d013060 change font-size for logout text phyusin 2017-11-23 14:00:45 +06:30