Commit Graph

2147 Commits

Author SHA1 Message Date
Aung Myo
5b9182c1d1 update rounding adj 2017-11-30 15:44:48 +06:30
Aung Myo
a871bf3789 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-11-30 12:05:28 +06:30
Aung Myo
6cb7c1e0c4 update rounding adj 2017-11-30 12:05:01 +06:30
Yan
d15be90a9e Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-30 11:24:24 +06:30
Yan
3c2bf42022 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2017-11-30 11:23:59 +06:30
Yan
de9701100d to_i to to_f in shift 2017-11-30 11:23:44 +06:30
Aung Myo
7ce71a1960 update inventory hide and cancan update 2017-11-30 11:19:15 +06:30
phyusin
0af1e5997f remove blank in account type 2017-11-30 11:18:08 +06:30
Aung Myo
67db27e35a Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-11-30 09:35:49 +06:30
Aung Myo
b3dae8c018 update paymentreport index 2017-11-30 09:34:51 +06:30
Yan
e4bebc2ca4 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-29 18:26:35 +06:30
Yan
313f745b6a Merge branch 'license' 2017-11-29 18:07:27 +06:30
Yan
d826e375b7 change license 2017-11-29 18:01:51 +06:30
Yan
e2aa1527ca license activate 2017-11-29 18:00:13 +06:30
Yan
29fa95d229 license activate 2017-11-29 17:59:46 +06:30
phyusin
ec1a8b6fc6 change card sale data in dashboard 2017-11-29 16:35:59 +06:30
phyusin
fec318db07 change width for close cashier pdf 2017-11-29 16:04:31 +06:30
phyusin
31ec2f959b change JCB and Master in close cashier pdf 2017-11-29 14:47:23 +06:30
phyusin
ea93de084e add font size for Total & Net Sales in close cashier and change closed time in transacctions 2017-11-29 14:11:56 +06:30
phyusin
c2d2dd7db5 remove rounding adj: in total for close cashier pdf 2017-11-29 13:54:48 +06:30
phyusin
3e5fc00da9 change bold in close cashier 2017-11-29 13:42:33 +06:30
phyusin
75ee51fd9f change close cashier pdf and card sale in dashboard 2017-11-29 13:34:03 +06:30
Aung Myo
a759cda7c6 update daily sale report 2017-11-29 11:56:31 +06:30
phyusin
92c8e65e11 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2017-11-29 11:50:08 +06:30
Yan
a1deab2b5e sale item 2017-11-29 11:36:31 +06:30
Yan
7740ab6ff7 add item instance code in sale item update 2017-11-29 11:22:54 +06:30
Yan
b1d9027d5b subdomain + domain 2017-11-29 11:21:26 +06:30
Yan
9bbdb22bfb Merge branch 'master' into license 2017-11-29 10:20:27 +06:30
phyusin
11c6fb2868 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2017-11-29 09:39:24 +06:30
Yan
f29a5b95a4 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-28 19:12:02 +06:30
Aung Myo
900efb3fa6 update report 2017-11-28 19:11:19 +06:30
Yan
51df43de44 remove paymal token in seed 2017-11-28 18:43:34 +06:30
Yan
b394643991 license 2017-11-28 18:10:17 +06:30
phyusin
5cfebe480f add date margin-left css in origami 2017-11-28 17:21:13 +06:30
Yan
f33be9e707 Merge branch 'master' into license 2017-11-28 17:07:58 +06:30
Yan
0b03c243ec is card true to string 2017-11-28 17:06:46 +06:30
Yan
6cae1b613c javascript is card true 2017-11-28 16:47:12 +06:30
Yan
93db6130a1 some wrong in memberdiscount and no pay if any card payment 2017-11-28 15:57:19 +06:30
Yan
2e1ba833e8 remove recent amount in credit payment index 2017-11-28 15:05:02 +06:30
Yan
009e600c87 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2017-11-28 15:02:34 +06:30
phyusin
ab337a3b8a add css for logout icon 2017-11-28 15:01:58 +06:30
Yan
ce5c7e4715 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2017-11-28 14:58:16 +06:30
Yan
442681c3a0 remove comment from void controler 2017-11-28 14:57:58 +06:30
phyusin
f669101d3c remove blank in collection select for menu item and menu item instance 2017-11-28 14:57:18 +06:30
phyusin
606e3392c3 remove conflict data 2017-11-28 14:52:57 +06:30
Yan
144aea94c7 remove comment 2017-11-28 14:41:27 +06:30
phyusin
785541e438 change report filter UI and check focus for datepicker 2017-11-28 14:16:25 +06:30
Yan
dd99b50419 add focus input first all backend form 2017-11-28 11:41:47 +06:30
Yan
5740bb68fd Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2017-11-28 11:38:31 +06:30
Yan
494d90c111 order item edit and print 2017-11-28 11:38:08 +06:30