Commit Graph

1176 Commits

Author SHA1 Message Date
phyusin
41aa840eb2 conflict data 2018-02-06 18:12:59 +06:30
phyusin
503f1df0ab change order data 2018-02-06 18:05:02 +06:30
phyusin
7a055470e8 add split bill for order item in room 2018-02-06 17:46:58 +06:30
Aung Myo
4440f16559 update oqs for loading 2018-02-06 17:44:10 +06:30
Aung Myo
313bcd5db9 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2018-02-06 17:02:44 +06:30
phyusin
d416f788cb Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill 2018-02-06 16:41:37 +06:30
Aung Myo
6503ca9a48 update home for oqs 2018-02-06 16:24:00 +06:30
Aung Myo
ee5abb65f8 update home for order 2018-02-06 16:21:47 +06:30
phyusin
9387703862 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill 2018-02-06 16:17:27 +06:30
phyusin
f093f1f0a7 split bill for order item 2018-02-06 16:17:08 +06:30
Aung Myo
1cbcab75b4 update for first bill 2018-02-06 10:43:59 +06:30
phyusin
0780744377 check booking with order item split 2018-02-05 16:57:46 +06:30
phyusin
2ebfdbe8bc add updated qty text in oqs 2018-02-05 15:29:31 +06:30
phyusin
65d9f0fb6f order update 2018-02-05 13:07:30 +06:30
phyusin
8fed8d701a add booking 2018-02-05 11:05:58 +06:30
phyusin
991bc48505 order item split bill process 2018-02-06 09:46:30 +06:30
phyusin
3dc6f42bd5 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill 2018-02-02 14:04:20 +06:30
phyusin
2821f4bb1c change booking_id 2018-02-02 13:42:37 +06:30
phyusin
d1fd92bfd3 split bill ui 2018-02-02 13:41:38 +06:30
phyusin
b553dd0661 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill 2018-02-01 18:04:17 +06:30
phyusin
48ce8e4809 split bill 2018-02-01 18:12:59 +06:30
phyusin
f608aa8516 check checkin time is available or valid time 2018-02-01 17:00:57 +06:30
phyusin
ae4746acfc change checkin time checked 2018-02-01 16:34:18 +06:30
phyusin
6c33040173 remove checkin if checkin not used 2018-02-01 16:25:11 +06:30
phyusin
383aeded60 check checkedin exist in lookups and void - sale 2018-02-01 16:16:26 +06:30
phyusin
73858fc293 change checkout time 2018-02-01 18:19:35 +06:30
phyusin
e9d7b9e2f5 change utc to utc.getlocal 2018-02-01 15:31:48 +06:30
Aung Myo
6bf22439e8 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2018-02-01 15:31:04 +06:30
Aung Myo
9efd54e68b update remove job from cable and cup control in print 2018-02-01 15:30:30 +06:30
phyusin
ee17ddac92 add rounding adj for table invoices 2018-01-31 17:47:06 +06:30
Aung Myo
a96091decb update oqs home 2018-01-27 14:11:34 +06:30
phyusin
2a09945d36 check add to existing invoice 2018-01-28 16:29:59 +06:30
phyusin
aa129ad469 heck rounding adjustment error 2018-01-28 16:12:59 +06:30
phyusin
89b89a3197 check checkout time and server time when order from api 2018-01-24 17:32:23 +06:30
Yan
e3fdc68f9a comment licence check 2018-01-23 15:15:12 +06:30
Yan
4248e53517 add sudo for sym run 2018-01-23 15:14:07 +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
phyusin
8b99c8bcc6 cahnge empty json to NIL 2018-01-22 22:13:17 +06:30
phyusin
3f41987d34 set_item_menus after OrderItem 2018-01-22 20:15:28 +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
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