Commit Graph

1988 Commits

Author SHA1 Message Date
Yan
861e554d63 fix for dining charges taxable price and ui modified 2017-11-21 12:10:53 +06:30
phyusin
55606cb959 autocomplete for CRM/QUEUE 2017-11-20 19:15:26 +06:30
phyusin
51cda9dfb2 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2017-11-20 14:56:25 +06:30
Yan
a423807554 crm index ui and remove zone and dining from seed 2017-11-20 12:23:49 +06:30
phyusin
0a283d448e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2017-11-20 09:18:47 +06:30
Yan
3aac2629c9 queue card ui 2017-11-17 19:55:26 +06:30
Yan
2555efa186 add order double click fix 2017-11-17 18:43:42 +06:30
Yan
d5fb88a275 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2017-11-17 18:28:21 +06:30
Yan
e95562ad20 edit addorder loading to oqs_loading 2017-11-17 18:27:48 +06:30
phyusin
3a91568664 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2017-11-17 18:26:27 +06:30
phyusin
66e6b69f12 add booking for assign customer in CRM 2017-11-17 18:26:01 +06:30
Yan
c56fb1b0f4 oqs back turbolink control 2017-11-17 16:39:37 +06:30
Yan
11f040b142 fix oqs css and oqs edit turbolink control 2017-11-17 16:31:03 +06:30
Yan
6c03d0249c Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-17 15:51:40 +06:30
Yan
e7cd8deb8e fix tester bugs 2017-11-17 15:51:20 +06:30
Aung Myo
73da4841c6 update salepayment for puts 2017-11-17 13:50:27 +06:30
Yan
a3eb2e44eb Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-17 13:33:11 +06:30
Aung Myo
02bf6f03f1 update customer show 2017-11-17 11:58:46 +06:30
Aung Myo
393d0badc3 update customer transaction list 2017-11-17 11:47:42 +06:30
phyusin
f333aa9a66 add top10 and bottom10 products in dashboard 2017-11-17 10:22:04 +06:30
phyusin
e5831f92f9 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2017-11-17 10:03:59 +06:30
phyusin
4899e624ef change dashboard ui 2017-11-17 09:56:40 +06:30
Aung Myo
cd7ae874b9 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-11-17 09:48:17 +06:30
Aung Myo
9b1bc61adc update cus show 2017-11-17 09:47:09 +06:30
Yan
a175ce3aeb temp fix get current booking 2017-11-16 21:14:59 +06:30
Yan
25fef8e61c check req bill cntrl 2017-11-16 21:12:16 +06:30
Yan
f18947789c Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-16 20:48:58 +06:30
Aung Myo
c0733d7c48 update queue view 2017-11-16 19:26:52 +06:30
phyusin
384c0f2dd2 align summary panel in dashboard 2017-11-16 18:23:42 +06:30
phyusin
b09061d9c2 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2017-11-16 18:19:05 +06:30
phyusin
d648bbf100 dashboard ui and checkin checkout process 2017-11-16 18:17:40 +06:30
Aung Myo
fd81cdf3ef update addorder 2017-11-16 14:27:17 +06:30
Aung Myo
6360a914b4 update add order for popup qty 2017-11-16 14:23:51 +06:30
Aung Myo
d107577ea7 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-11-16 10:20:45 +06:30
Aung Myo
ccbdd5b2c8 update shift sale detail 2017-11-16 10:03:01 +06:30
Yan
059d1fc853 remove log in custom js 2017-11-15 19:15:20 +06:30
Yan
f8823360e3 add instance code to assigned_order_items 2017-11-15 17:59:32 +06:30
Yan
50aca66abe Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-15 17:56:16 +06:30
Aung Myo
bf0a8135f6 update rebate for credit and redeem 2017-11-15 17:54:59 +06:30
Yan
50bf67f5e5 miss and add instance in oqs 2017-11-15 16:46:00 +06:30
Yan
d1765ca32c fix for oqs and add instance code to assign order item 2017-11-15 16:19:44 +06:30
Aung Myo
ef253cd1dc Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-11-15 13:40:35 +06:30
Aung Myo
308d9eefde update booking search 2017-11-15 13:40:09 +06:30
Yan
71a4b9b7e3 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2017-11-15 13:28:46 +06:30
phyusin
37b509474f Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2017-11-15 13:28:18 +06:30
phyusin
9647a28f91 dashboard chart UI 2017-11-15 13:27:42 +06:30
Yan
e263ba2433 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-15 12:06:55 +06:30
Yan
b8dc74f517 merge with license but not complete 2017-11-15 12:06:06 +06:30
Aung Myo
1c0a93d56d update pagination and booking and rebate redeem 2017-11-15 12:02:02 +06:30
Yan
12f75ff403 licensing 2017-11-15 12:01:49 +06:30