Commit Graph

2396 Commits

Author SHA1 Message Date
phyusin
61142b7244 add void in sale item again 2018-01-25 17:34:13 +06:30
Aung Myo
ca54fa21ab Merge branch 'adminbsb_material_ui' 2018-01-25 15:34:48 +06:30
Aung Myo
142bac74a8 update payment action cable 2018-01-25 15:33:52 +06:30
phyusin
3c37852250 change query in sale 2018-01-25 14:24:59 +06:30
phyusin
2f3ae2467e add interger checked for promotions 2018-01-25 10:37:05 +06:30
phyusin
2319664164 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-01-25 09:21:38 +06:30
Aung Myo
b3905a461e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-01-24 18:13:40 +06:30
Aung Myo
357c7c8682 update table invoice 2018-01-24 18:12:47 +06:30
phyusin
89b89a3197 check checkout time and server time when order from api 2018-01-24 17:32:23 +06:30
phyusin
73eb86ce9a add localization for settings/lookups 2018-01-23 16:13:23 +06:30
Yan
e3fdc68f9a comment licence check 2018-01-23 15:15:12 +06:30
Yan
46c6998738 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-01-23 15:14:20 +06:30
Yan
4248e53517 add sudo for sym run 2018-01-23 15:14:07 +06:30
phyusin
f6b92ad111 change person item code process 2018-01-23 15:02:50 +06:30
Yan
773e1d2db0 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-01-23 14:40:44 +06:30
Yan
aa8c2621fc add response in license 2018-01-23 14:40:32 +06:30
Aung Myo
8d2a928456 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-01-23 13:13:01 +06:30
Aung Myo
65292af9cb update ablity for waiter 2018-01-23 13:12:42 +06:30
phyusin
05eb068e38 check oqs js 2018-01-22 22:20:35 +06:30
phyusin
8b99c8bcc6 cahnge empty json to NIL 2018-01-22 22:13:17 +06:30
phyusin
127d61fbae Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-01-22 20:15:51 +06:30
phyusin
3f41987d34 set_item_menus after OrderItem 2018-01-22 20:15:28 +06:30
Aung Myo
b5ad0598e9 update complete repritn 2018-01-22 19:16:15 +06:30
phyusin
9a521ace7c change spent cal: 2018-01-22 18:21:09 +06:30
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