Commit Graph

1136 Commits

Author SHA1 Message Date
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
Yan
384923133b license flash msg and add set Item price 2018-01-19 10:43:08 +06:30
Yan
7f7e564786 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-01-18 11:48:54 +06:30
phyusin
e02ce7c3e6 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-01-18 11:44:05 +06:30
Aung Myo
b3d6b9858b update addorder controller for order items 2018-01-18 11:43:21 +06:30
phyusin
45873672b6 add set menu items for template and code 2018-01-18 11:23:10 +06:30
Yan
ba00b84ba5 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-01-17 12:09:20 +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
phyusin
bc2d6e07f1 check empty for checkout time and checkout alert time 2018-01-16 14:59:47 +06:30
phyusin
d8c62b0d44 change and check order_slim_pdf 2018-01-16 14:55:33 +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
7c6fedebe9 update open print service 2018-01-16 13:33:29 +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
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
Aung Myo
5060d8caaf Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-01-15 15:15:18 +06:30
Aung Myo
3d685f201f update cloud and master remove puts 2018-01-15 15:10:16 +06:30
Aung Myo
9ab9f3b002 update cloud and master 2018-01-15 15:08:52 +06:30
phyusin
9095dd46d9 change move table UI 2018-01-15 15:04:17 +06:30
phyusin
51041bf0ae add extra hour 15 and 45 minutes 2018-01-15 14:19:41 +06:30
Yan
7af82ae921 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-01-12 18:12:05 +06:30
Yan
ad4be54ef2 request key 2018-01-12 18:11:52 +06:30
Aung Myo
89bdf83891 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into cloud 2018-01-12 17:11:48 +06:30
Aung Myo
f214be8847 update cloud for print and first bill 2018-01-12 16:41:28 +06:30
phyusin
86d068ddd4 check checkout_time is available ot not 2018-01-12 16:29:17 +06:30
Aung Myo
0b517807f9 update check server mode 2018-01-12 15:46:40 +06:30
Aung Myo
6ff3b04454 fixed confiixed for print 2018-01-12 15:19:22 +06:30
Yan
649711f72d license key api for redis 2018-01-12 15:07:11 +06:30
phyusin
bb2c8694a5 add unionpay process for payment 2018-01-11 16:08:17 +06:30
phyusin
2d2a154c17 check multiple other payments in receipt 2018-01-11 11:46:05 +06:30
phyusin
0eda7543ff Merge branch 'bank_integration' of bitbucket.org:code2lab/sxrestaurant 2018-01-10 19:02:39 +06:30
phyusin
58e779862f change process flow for cb with bank_integration in lookups 2018-01-10 18:57:14 +06:30
Yan
4378a3c5c4 Merge branch 'bank_integration' of bitbucket.org:code2lab/sxrestaurant 2018-01-10 18:16:41 +06:30
phyusin
903dddd8cc CB ECR Integration 2018-01-10 18:08:28 +06:30
Aung Myo
410cacf279 update limit tablet autorized 2018-01-10 17:59:20 +06:30
Yan
bac1309f1f remove frt bill 2018-01-09 16:56:34 +06:30
Yan
2b50ae5fb9 merge with master 2018-01-09 16:40:45 +06:30
Yan
afd893d831 remove a5 2018-01-09 16:33:10 +06:30
Yan
be6dd25a70 a5 print format done 2018-01-09 15:58:37 +06:30
Aung Myo
674f6cd37d update decimal and delimeter for dashboard 2018-01-09 10:52:52 +06:30
Aung Myo
cd2f9fdcb0 update precision and delimetor all 2018-01-08 17:00:00 +06:30
phyusin
ae6caefaa0 change query in sale item report 2018-01-05 13:33:23 +06:30