Commit Graph

2222 Commits

Author SHA1 Message Date
phyusin
f28388ada1 change menu category code error in sale item 2018-01-22 16:19:13 +06:30
phyusin
951d64d761 cahnge room ui 2018-01-19 16:20:02 +06:30
phyusin
3e35ba109b Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-01-19 16:07:23 +06:30
phyusin
3a21d85a4b add set_menu_item in origami and oqs 2018-01-19 16:06:58 +06:30
Aung Myo
9de47cc5da update check for license file 2018-01-19 11:47:46 +06:30
Aung Myo
63db49ca35 Merge branch 'adminbsb_material_ui' 2018-01-19 11:46:43 +06:30
Aung Myo
57425a6bc9 update sale item for set menu 2018-01-19 11:44:30 +06:30
Yan
3e92becfb6 update price in set item 2018-01-19 11:34:53 +06:30
Yan
384923133b license flash msg and add set Item price 2018-01-19 10:43:08 +06:30
Yan
44f1db3073 check for order source emenu and cashier for set items 2018-01-18 12:20:20 +06:30
Yan
7f7e564786 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-01-18 11:48:54 +06:30
Aung Myo
b3d6b9858b update addorder controller for order items 2018-01-18 11:43:21 +06:30
phyusin
7f127f63a7 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-01-18 11:23:27 +06:30
phyusin
45873672b6 add set menu items for template and code 2018-01-18 11:23:10 +06:30
Aung Myo
fdd5e3d2d7 Merge branch 'adminbsb_material_ui' 2018-01-18 11:03:01 +06:30
Aung Myo
b4fb8b2be6 update menu valid date and limit time ,addorder for parent order item id 2018-01-18 10:41:29 +06:30
Yan
a9c9f4d750 set items in order 2018-01-17 17:59:48 +06:30
Yan
43e9e2c993 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-01-17 14:47:24 +06:30
phyusin
9f9ec7af40 change pdf func: 2018-01-17 14:35:35 +06:30
Yan
ba00b84ba5 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-01-17 12:09:20 +06:30
phyusin
57f042aec2 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-01-17 12:08:27 +06:30
phyusin
06686b06bb add settings for order item, order summary slim and receiptbillA5, receiptbillShowAltName 2018-01-17 12:08:14 +06:30
Yan
0dc66e0273 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-01-17 12:06:29 +06:30
Aung Myo
ef816a5969 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2018-01-17 10:41:34 +06:30
Aung Myo
9396982261 update sale item price 0 2018-01-17 10:39:46 +06:30
Aung Myo
82c8ef3f60 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-01-16 17:36:27 +06:30
Aung Myo
d5b42b0ff0 update cable for cloud 2018-01-16 17:19:14 +06:30
phyusin
bc2d6e07f1 check empty for checkout time and checkout alert time 2018-01-16 14:59:47 +06:30
phyusin
d152d62e80 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-01-16 14:55:48 +06:30
phyusin
d8c62b0d44 change and check order_slim_pdf 2018-01-16 14:55:33 +06:30
Aung Myo
37d01f6903 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-01-16 14:32:50 +06:30
Aung Myo
7fadeeed2e update suppervisor ability and room & table first bill 2018-01-16 14:32:24 +06:30
phyusin
5a5f47c946 add order_slim_pdf in settings/lookups and change order_slim_pdf 2018-01-16 14:21:50 +06:30
Aung Myo
f2daaae801 update control payment multiple 2018-01-16 14:13:01 +06:30
Aung Myo
d6a4b3992d Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-01-16 13:34:00 +06:30
Aung Myo
7c6fedebe9 update open print service 2018-01-16 13:33:29 +06:30
phyusin
2837e4dd40 check booking in movetable 2018-01-16 13:22:58 +06:30
phyusin
468914fb3c add printer lists in settings/oqs 2018-01-16 11:44:21 +06:30
phyusin
0972f3ddef Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-01-16 11:39:53 +06:30
phyusin
2703c3c37a add printer lists of system 2018-01-16 11:39:37 +06:30
Aung Myo
2472a66c12 Merge branch 'adminbsb_material_ui' 2018-01-16 11:01:34 +06:30
Aung Myo
eb29b20654 update combine cloud and master bugs 2018-01-16 10:57:20 +06:30
phyusin
89e563ce1e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-01-16 10:15:43 +06:30
phyusin
ca98efc756 change checkout time and checkout alert time process 2018-01-16 10:15:28 +06:30
Aung Myo
649e99f176 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-01-15 17:49:21 +06:30
Aung Myo
fb989572b1 update room for first bill 2018-01-15 17:48:35 +06:30
phyusin
9f7c481270 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-01-15 16:48:39 +06:30
Aung Myo
b480f8cd61 update payment detail show 2018-01-15 16:47:41 +06:30
phyusin
dc2637ed39 change process flow for extra time 2018-01-15 16:32:20 +06:30
Yan
64253377fb Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-01-15 15:20:52 +06:30