Yan
|
34450aa5d6
|
re-remove item discount for foc
|
2017-11-30 18:56:46 +06:30 |
|
Yan
|
769a4b7b4b
|
check and no discount item when bill foc
|
2017-11-30 18:40:29 +06:30 |
|
Yan
|
72b8047754
|
remove check is taxable in sale item discount cal
|
2017-11-30 18:33:26 +06:30 |
|
Yan
|
f4116fe9fb
|
oqs edit
|
2017-11-30 18:12:48 +06:30 |
|
Aung Myo
|
2e9847986d
|
update paymentmenthd for foc
|
2017-11-30 17:58:42 +06:30 |
|
Yan
|
7552bbeefe
|
Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant
|
2017-11-30 17:52:27 +06:30 |
|
Aung Myo
|
32aa3f581d
|
update paymentmenthd for foc
|
2017-11-30 17:51:30 +06:30 |
|
Yan
|
caf7634d1b
|
Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant
|
2017-11-30 17:35:16 +06:30 |
|
Yan
|
aa1d2e4f59
|
cloud change
|
2017-11-30 17:29:56 +06:30 |
|
Aung Myo
|
3ddd4121db
|
update payment report
|
2017-11-30 17:24:15 +06:30 |
|
Aung Myo
|
5b9182c1d1
|
update rounding adj
|
2017-11-30 15:44:48 +06:30 |
|
Aung Myo
|
a871bf3789
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui
|
2017-11-30 12:05:28 +06:30 |
|
Yan
|
de9701100d
|
to_i to to_f in shift
|
2017-11-30 11:23:44 +06:30 |
|
Aung Myo
|
7ce71a1960
|
update inventory hide and cancan update
|
2017-11-30 11:19:15 +06:30 |
|
Yan
|
313f745b6a
|
Merge branch 'license'
|
2017-11-29 18:07:27 +06:30 |
|
Yan
|
29fa95d229
|
license activate
|
2017-11-29 17:59:46 +06:30 |
|
Yan
|
a1deab2b5e
|
sale item
|
2017-11-29 11:36:31 +06:30 |
|
Yan
|
7740ab6ff7
|
add item instance code in sale item update
|
2017-11-29 11:22:54 +06:30 |
|
Yan
|
9bbdb22bfb
|
Merge branch 'master' into license
|
2017-11-29 10:20:27 +06:30 |
|
Yan
|
f29a5b95a4
|
Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant
|
2017-11-28 19:12:02 +06:30 |
|
Aung Myo
|
900efb3fa6
|
update report
|
2017-11-28 19:11:19 +06:30 |
|
Yan
|
f33be9e707
|
Merge branch 'master' into license
|
2017-11-28 17:07:58 +06:30 |
|
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
|
c4e9abbf19
|
amount_due >= 0 for grand total 0
|
2017-11-24 10:40:52 +06:30 |
|
Yan
|
a5a33b269a
|
Merge branch 'master' into license
|
2017-11-24 10:15:37 +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 |
|