Commit Graph

2633 Commits

Author SHA1 Message Date
Aung Myo
b1fa5f1518 update add extra time 2018-01-02 12:30:57 +06:30
phyusin
f7c4cb0733 remove per_spent amt in view_orders 2017-12-29 17:35:01 +06:30
phyusin
23422aa5a7 fix for void and float cal: error 2017-12-29 15:08:48 +06:30
Aung Myo
2a7eb7a12a Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-12-29 14:44:27 +06:30
Aung Myo
bbd708e91d update foc error for name error 2017-12-29 14:44:01 +06:30
Aung Myo
26a11ebecd add extra charge in oroder 2017-12-29 14:39:47 +06:30
phyusin
30dac06c8a add membership type in customer 2017-12-29 12:02:40 +06:30
Ye Min
e2aacc342f Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-12-29 11:18:01 +06:30
Ye Min
86d7eabfc6 cap shop.json 2017-12-29 11:17:36 +06:30
Aung Myo
9f04fae692 update rouding adj 2017-12-29 10:00:36 +06:30
Aung Myo
ad690c562b update rounding 0 for foc and memberdiscount 2017-12-29 09:22:22 +06:30
Aung Myo
c9f230fa70 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-12-28 18:05:44 +06:30
Aung Myo
c8d31e4523 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2017-12-28 18:03:30 +06:30
Aung Myo
ecb9a5f010 update void foc and credit for member discount 2017-12-28 18:02:25 +06:30
phyusin
90525b9391 add extra minutes in api/check_in 2017-12-28 17:48:56 +06:30
Aung Myo
d58f7d1605 update addord for extra time 2017-12-28 16:21:49 +06:30
Aung Myo
06acf3acb9 update ruby version 2017-12-28 13:21:23 +06:30
Aung Myo
7b0c504900 Merge branch 'adminbsb_material_ui' 2017-12-28 11:01:28 +06:30
Aung Myo
23e7c8db97 update payment control with first bill 2017-12-28 10:59:23 +06:30
Ye Min
722ee6982c Ruby 2.4.1 2017-12-28 09:46:48 +06:30
Aung Myo
78729980ee Merge branch 'adminbsb_material_ui' 2017-12-27 18:22:39 +06:30
Aung Myo
d8738dbf5a update print add item code and addorder js for set item create in print 2017-12-27 18:16:31 +06:30
Ye Min
b2b05246d1 Cap setup 2017-12-27 13:11:05 +06:30
phyusin
0aba9e8d76 change css for logo 2017-12-27 11:27:13 +06:30
phyusin
3d235f9d69 add alert_time_min in api/checkin and check for waiter login 2017-12-27 10:30:22 +06:30
Aung Myo
48fb5563f5 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-12-26 16:20:18 +06:30
Aung Myo
a525babf9a update order queue printer for bitp k5 problem 2017-12-26 16:19:25 +06:30
phyusin
d969f3d3eb change js format for localStorage 2017-12-26 15:10:18 +06:30
phyusin
67291f6ce2 change js format in origami 2017-12-26 14:45:32 +06:30
phyusin
ad86fe279e check and change update shift payment 2017-12-22 18:24:29 +06:30
Yan
89c379ac0f Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-12-22 17:51:43 +06:30
Yan
c9f44e5f21 license disable 2017-12-22 17:51:21 +06:30
Aung Myo
5bd1daa152 update payment and memberdiscoun 2017-12-22 17:51:02 +06:30
Yan
1ec0754d0d Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-12-22 16:37:09 +06:30
Yan
11d9912401 license updated 2017-12-22 16:35:04 +06:30
Yan
da4af7bfc5 license updated 2017-12-22 16:33:12 +06:30
phyusin
dad83a1f83 change receipt bill format 2017-12-22 16:33:10 +06:30
phyusin
7d8fddbdeb check order by and code for menu cats: 2017-12-22 14:43:59 +06:30
phyusin
9094d46209 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-12-22 09:27:05 +06:30
Aung Myo
a10a41f3ed update romm show page 2017-12-21 19:16:53 +06:30
phyusin
bc3beea75b Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2017-12-21 18:13:35 +06:30
phyusin
3878f1644b change UI for menu cats: 2017-12-21 18:13:24 +06:30
phyusin
d904784e61 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-12-21 18:08:22 +06:30
phyusin
a3e15bf68c check Add oth charges data 2017-12-21 18:04:27 +06:30
Aung Myo
f2fe6975d2 update sale audit paymal 2017-12-21 18:04:23 +06:30
phyusin
43b8fffc11 change rebate with creditnote in payment controller 2017-12-21 17:22:03 +06:30
phyusin
483d45b8e6 add receipt no for member 2017-12-21 16:46:59 +06:30
phyusin
1330be36a5 change arr format in origami js 2017-12-21 16:27:30 +06:30
phyusin
32df2682ea change origami js 2017-12-21 16:11:13 +06:30
phyusin
2e3d81dedb change js fun: in origami 2017-12-21 16:03:15 +06:30