Aung Myo
|
a871bf3789
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui
|
2017-11-30 12:05:28 +06:30 |
|
Aung Myo
|
6cb7c1e0c4
|
update rounding adj
|
2017-11-30 12:05:01 +06:30 |
|
Yan
|
d15be90a9e
|
Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant
|
2017-11-30 11:24:24 +06:30 |
|
Aung Myo
|
7ce71a1960
|
update inventory hide and cancan update
|
2017-11-30 11:19:15 +06:30 |
|
phyusin
|
0af1e5997f
|
remove blank in account type
|
2017-11-30 11:18:08 +06:30 |
|
Aung Myo
|
67db27e35a
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui
|
2017-11-30 09:35:49 +06:30 |
|
Aung Myo
|
b3dae8c018
|
update paymentreport index
|
2017-11-30 09:34:51 +06:30 |
|
Yan
|
e4bebc2ca4
|
Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant
|
2017-11-29 18:26:35 +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 |
|
phyusin
|
ec1a8b6fc6
|
change card sale data in dashboard
|
2017-11-29 16:35:59 +06:30 |
|
phyusin
|
ea93de084e
|
add font size for Total & Net Sales in close cashier and change closed time in transacctions
|
2017-11-29 14:11:56 +06:30 |
|
phyusin
|
75ee51fd9f
|
change close cashier pdf and card sale in dashboard
|
2017-11-29 13:34:03 +06:30 |
|
Aung Myo
|
a759cda7c6
|
update daily sale report
|
2017-11-29 11:56:31 +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
|
6cae1b613c
|
javascript is card true
|
2017-11-28 16:47:12 +06:30 |
|
Yan
|
93db6130a1
|
some wrong in memberdiscount and no pay if any card payment
|
2017-11-28 15:57:19 +06:30 |
|
Yan
|
2e1ba833e8
|
remove recent amount in credit payment index
|
2017-11-28 15:05:02 +06:30 |
|
phyusin
|
ab337a3b8a
|
add css for logout icon
|
2017-11-28 15:01:58 +06:30 |
|
phyusin
|
f669101d3c
|
remove blank in collection select for menu item and menu item instance
|
2017-11-28 14:57:18 +06:30 |
|
phyusin
|
785541e438
|
change report filter UI and check focus for datepicker
|
2017-11-28 14:16:25 +06:30 |
|
phyusin
|
989ce16a23
|
dailysale report UI
|
2017-11-28 11:03:29 +06:30 |
|
phyusin
|
4192a94d47
|
check print copy greater than 0 in print_settings
|
2017-11-27 19:33:18 +06:30 |
|
phyusin
|
ad34002789
|
change query for transactions/order and transactions/bookings, transactions/credit
|
2017-11-27 18:16:46 +06:30 |
|
Yan
|
7a28dc1ddc
|
Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant
|
2017-11-27 17:50:06 +06:30 |
|
Yan
|
0c084a1816
|
credit payment fix when visa assign
|
2017-11-27 14:24:34 +06:30 |
|
Aung Myo
|
20d580b2ab
|
update foc and void for authorized
|
2017-11-27 13:54:21 +06:30 |
|
phyusin
|
9ad9e9ae57
|
change select box for item attribute in menu item instance and button UI for CRM/Queue
|
2017-11-27 13:33:20 +06:30 |
|
phyusin
|
98be8b37a4
|
change Logout UI
|
2017-11-27 09:55:17 +06:30 |
|
phyusin
|
c170974224
|
change promotion with menu item and menu item instance
|
2017-11-27 09:23:10 +06:30 |
|
Yan
|
87a27250b7
|
fix minus addorder.js and void and other origami
|
2017-11-26 22:23:37 +06:30 |
|
Yan
|
6eb3d9399e
|
Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant
|
2017-11-26 14:40:45 +06:30 |
|
Yan
|
9226a7b18d
|
only show instance attribute in menu item selected
|
2017-11-26 14:40:01 +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
|
7140df5bf8
|
remove comment in sale item
|
2017-11-24 19:27:05 +06:30 |
|
Aung Myo
|
b611fcde97
|
update sale item report
|
2017-11-24 19:15:59 +06:30 |
|
Aung Myo
|
ef09042450
|
update sale item report
|
2017-11-24 19:12:33 +06:30 |
|
Yan
|
3809413a6f
|
Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant
|
2017-11-24 19:04:55 +06:30 |
|
Aung Myo
|
6aed8f89c5
|
update sale item report
|
2017-11-24 19:03:53 +06:30 |
|
Aung Myo
|
b49f46a5c2
|
update sale item report
|
2017-11-24 18:57:01 +06:30 |
|
Yan
|
5beb427dfe
|
Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant
|
2017-11-24 13:12:16 +06:30 |
|
Aung Myo
|
479a6b5a61
|
update search data in transaction
|
2017-11-24 13:09:22 +06:30 |
|
phyusin
|
1bbeba8485
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2017-11-24 11:56:23 +06:30 |
|
phyusin
|
cb8aa0c8c9
|
change UI for other payment
|
2017-11-24 11:56:06 +06:30 |
|
Yan
|
a34706dd49
|
Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant
|
2017-11-24 10:43:14 +06:30 |
|
Aung Myo
|
b8df371a93
|
update addorder
|
2017-11-24 10:42:18 +06:30 |
|