Yan
|
93db6130a1
|
some wrong in memberdiscount and no pay if any card payment
|
2017-11-28 15:57:19 +06:30 |
|
Yan
|
494d90c111
|
order item edit and print
|
2017-11-28 11:38:08 +06:30 |
|
Yan
|
8b6e909220
|
Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant
|
2017-11-27 19:42:16 +06:30 |
|
phyusin
|
4192a94d47
|
check print copy greater than 0 in print_settings
|
2017-11-27 19:33:18 +06:30 |
|
Yan
|
e5746b902b
|
update for print copies for printer_worker.rb
|
2017-11-27 19:03:50 +06:30 |
|
phyusin
|
ad34002789
|
change query for transactions/order and transactions/bookings, transactions/credit
|
2017-11-27 18:16:46 +06:30 |
|
Yan
|
87a27250b7
|
fix minus addorder.js and void and other origami
|
2017-11-26 22:23:37 +06:30 |
|
Aung Myo
|
74a9166620
|
update fixed conflicx
|
2017-11-25 16:51:11 +06:30 |
|
Aung Myo
|
2ebecc2fb2
|
update reports
|
2017-11-25 16:32:30 +06:30 |
|
Yan
|
3809413a6f
|
Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant
|
2017-11-24 19:04:55 +06:30 |
|
Aung Myo
|
b49f46a5c2
|
update sale item report
|
2017-11-24 18:57:01 +06:30 |
|
Yan
|
7c977e8423
|
amount_due >= 0 for grand total 0
|
2017-11-24 10:41:21 +06:30 |
|
Yan
|
840b0fc4fb
|
Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant
|
2017-11-23 18:12:27 +06:30 |
|
Yan
|
25e9253fee
|
substract total_amount - overall discount in shift sale
|
2017-11-23 18:12:07 +06:30 |
|
Aung Myo
|
d78ba65675
|
update addorder and wrong tax
|
2017-11-23 17:34:31 +06:30 |
|
Yan
|
8f0b44ca7b
|
price 0 print
|
2017-11-23 12:53:07 +06:30 |
|
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
|
f8e6291d1b
|
Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant
|
2017-11-22 18:39:56 +06:30 |
|
Yan
|
6beb32348d
|
major fix taxable price for sale and other sale and oqs
|
2017-11-22 18:39:35 +06:30 |
|
phyusin
|
afcf7725f5
|
change UI for all settings module
|
2017-11-22 16:28:17 +06:30 |
|
phyusin
|
dde553ebe2
|
change total card query
|
2017-11-22 13:27:22 +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
|
749e271879
|
update saleitem rb syntax err
|
2017-11-22 09:59:13 +06:30 |
|
Yan
|
6ce3f8e044
|
add sale items in sale item model
|
2017-11-21 19:33:20 +06:30 |
|
Yan
|
ad66a6570b
|
add popper.js.map and remove .idea
|
2017-11-21 16:30:56 +06:30 |
|
Yan
|
861e554d63
|
fix for dining charges taxable price and ui modified
|
2017-11-21 12:10:53 +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 |
|
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
|
a175ce3aeb
|
temp fix get current booking
|
2017-11-16 21:14:59 +06:30 |
|
Yan
|
f18947789c
|
Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant
|
2017-11-16 20:48:58 +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 |
|
Aung Myo
|
bf0a8135f6
|
update rebate for credit and redeem
|
2017-11-15 17:54:59 +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 |
|