Commit Graph

924 Commits

Author SHA1 Message Date
Yan
edd28332da Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2017-11-23 12:14:32 +06:30
Yan
f4898017d1 price 0 print 2017-11-23 12:14:14 +06:30
phyusin
b64229aded change UI and query for dashboard and UI for Origami/Commissions 2017-11-23 11:56:49 +06:30
Yan
3261fef3cf fix dis and payment foc and sale item report 2017-11-22 20:47:53 +06:30
Yan
06582d755e Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-22 18:40:38 +06:30
Yan
6beb32348d major fix taxable price for sale and other sale and oqs 2017-11-22 18:39:35 +06:30
Yan
1fd4108ac0 change all sale item 2017-11-22 12:12:27 +06:30
Aung Myo
5b7ba0c144 update supervisor wrong spelling 2017-11-22 10:40:43 +06:30
Aung Myo
3041d6a368 update search data in transaction 2017-11-21 18:29:41 +06:30
Yan
7252e39515 merge with aung 2017-11-21 16:47:07 +06:30
Yan
ad66a6570b add popper.js.map and remove .idea 2017-11-21 16:30:56 +06:30
Aung Myo
21bd0f9575 update sqa testing feedback 2017-11-21 16:04:45 +06:30
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
Yan
d5fb88a275 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2017-11-17 18:28:21 +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
e7cd8deb8e fix tester bugs 2017-11-17 15:51:20 +06:30
Yan
a3eb2e44eb Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-17 13:33:11 +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
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
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
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
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
7c6153f16f licensing 2017-11-15 12:01:35 +06:30
Yan
93769bacb7 licensing 2017-11-14 18:35:14 +06:30
Aung Myo
28dbb75774 update rebate and update api 2017-11-14 18:30:57 +06:30
Yan
222114a3c3 licensing 2017-11-14 16:06:17 +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
Yan
abb8838215 licensing 2017-11-14 15:31:18 +06:30
Yan
683982d4f5 adding license 2017-11-14 15:11:16 +06:30