Commit Graph

1468 Commits

Author SHA1 Message Date
Aung Myo
71a03a56d4 update oqs view 2017-11-21 09:19:18 +06:30
phyusin
55606cb959 autocomplete for CRM/QUEUE 2017-11-20 19:15:26 +06:30
Yan
b046086ea4 Merge branch 'master' into license 2017-11-20 13:54:54 +06:30
Yan
a423807554 crm index ui and remove zone and dining from seed 2017-11-20 12:23:49 +06:30
Yan
3aac2629c9 queue card ui 2017-11-17 19:55:26 +06:30
Yan
e95562ad20 edit addorder loading to oqs_loading 2017-11-17 18:27:48 +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
e7cd8deb8e fix tester bugs 2017-11-17 15:51:20 +06:30
Aung Myo
30e6b46237 update backk buttom in oqs 2017-11-17 14:31:19 +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
Yan
34fd7a80d6 Merge branch 'master' into license 2017-11-17 10:25:32 +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
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
Yan
178b3484be added license 2017-11-16 16:13:26 +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
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
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
Aung Myo
1c0a93d56d update pagination and booking and rebate redeem 2017-11-15 12:02:02 +06:30
Aung Myo
de3f2e5e90 clear buttom in datepickere 2017-11-15 09:44:52 +06:30
Yan
36275b55c6 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-14 15:54:17 +06:30
Aung Myo
f927d99807 update transaction 2017-11-14 15:48:22 +06:30
Aung Myo
937576856f update back buttom in cashier default 2017-11-14 15:33:06 +06:30
Aung Myo
6f06e7a9d7 add booking list in transaction 2017-11-14 13:42:00 +06:30
Yan
fa7cb53e55 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-14 13:08:22 +06:30
Aung Myo
f1a28d64e1 update OQS and cashier 2017-11-14 09:43:13 +06:30
Yan
97fd7619ce license test 2017-11-10 18:08:48 +06:30
Yan
4ad65c5480 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-10 14:35:05 +06:30
Aung Myo
8db96beca0 update oqs view an d promotion form update 2017-11-10 14:32:21 +06:30
Yan
fb64041a3f Merge branch 'master' into license 2017-11-10 11:30:05 +06:30
Yan
e5f1a44551 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-09 18:31:16 +06:30