Nweni
1f7ba42e80
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
2017-08-24 18:04:57 +06:30
Nweni
81f430b5c6
inventory setup
2017-08-24 18:04:42 +06:30
Phyo
857fcd419f
Promotion Time Fixed
2017-08-23 19:09:44 +06:30
Zin Lin Phyo
d6b8e8bdee
update commissioner
2017-08-23 11:36:36 +06:30
Zin Lin Phyo
3132bc7c34
commission update
2017-08-23 11:14:24 +06:30
Zin Lin Phyo
618f5f3b7c
commssions
2017-08-21 16:11:51 +06:30
Zin Lin Phyo
2a736cc92f
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
...
* 'august_spring' of bitbucket.org:code2lab/sxrestaurant: (71 commits)
Update
Coupon / Voucher data change
update menu_sync
update addorder
update addorder view
add fields for Menu Sync
update add oreder
add menu api
update add order and calculate subtotal
update seed
menu ui update
update ability for setmenu
fixed
update show for foc
add bootstrap file input and menu item img implemented
update foc and pdf
update menu item
update receipt bill pdf for foc and credit
add CarrierWave gems for menu image upload
add CarrierWave gems for menu image upload
...
2017-08-21 13:30:28 +06:30
Zin Lin Phyo
7b0db433c4
commissioner scaffold
2017-08-21 13:30:04 +06:30
Aung Myo
d4d8961b87
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into addorder
2017-08-17 09:54:55 +06:30
Aung Myo
865c2c5cdd
update add order
2017-08-17 09:54:19 +06:30
Yan
0eee1fd0af
menu ui update
2017-08-16 18:26:30 +06:30
Yan
e0789ecb97
Merge branch 'menu_sync' of bitbucket.org:code2lab/sxrestaurant
2017-08-15 17:24:46 +06:30
Yan
513530e8f3
Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant
2017-08-15 16:42:32 +06:30
Yan
e69eeadb6e
add bootstrap file input and menu item img implemented
2017-08-15 16:27:40 +06:30
Aung Myo
997cc0733c
add item set and menu item set CRUD
2017-08-14 17:57:55 +06:30
Yan
ac47d7d8f0
update dashbiard ui
2017-08-14 15:57:34 +06:30
Yan
edb4ab0425
Merge branch 'master' into menu_sync
2017-08-14 15:34:19 +06:30
Yan
5a5e654dbc
move css to css file
2017-08-14 15:26:04 +06:30
Yan
03a6208a76
add item set with scaffold
2017-08-11 17:41:10 +06:30
Nweni
b0ad2049c5
dining_charges
2017-08-11 13:34:30 +06:30
Aung Myo
285ad93501
update filter in sale and order and creditnote
2017-08-08 09:43:58 +06:30
Aung Myo
c93b50d46a
update conflict oragimi.scss
2017-07-26 10:04:49 +06:30
Yan
c068d702b3
still nfc
2017-07-18 11:52:49 +06:30
Yan
df06b81b28
Merge branch 'staging'
2017-07-17 15:13:31 +06:30
Yan
51c14f379b
still nfc
2017-07-17 15:07:27 +06:30
Yan
b2ccc12e17
add paypar acc for nfc
2017-07-16 18:16:52 +06:30
Aung Myo
0b7b5cae30
update osaka demo bugs
2017-07-14 17:23:40 +06:30
Yan
6f57bb8a79
adding shift sale summary
2017-07-13 11:12:02 +06:30
Aung Myo
2d55ea0dab
update add order
2017-07-07 09:56:18 +06:30
Aung Myo
040d60402b
update edit qty and price and cash and credit div in payment details
2017-07-06 12:54:04 +06:30
Aung Myo
7cee40746d
update unsuccessfully rebate and alert
2017-07-05 14:42:40 +06:30
Aung Myo
1d08954a76
update shift sale
2017-06-30 13:32:56 +06:30
Aung Myo
f60c145c00
update queue
2017-06-29 14:33:05 +06:30
Aung Myo
173d824c27
update card column in queue
2017-06-28 23:45:28 +06:30
Aung Myo
e9e184894d
update fixed conflict
2017-06-28 16:44:31 +06:30
Aung Myo
ab7f08b1d6
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm
2017-06-28 12:47:18 +06:30
Min Zeya Phyo
ee651763b7
shift close and payment journal
2017-06-28 10:34:42 +06:30
Yan
58a8cdec6e
still dev dis
2017-06-27 18:32:58 +06:30
Aung Myo
53ff3989b5
update merge cancan
2017-06-27 16:55:56 +06:30
Aung Myo
4c13be257b
update authroize
2017-06-26 22:45:34 +06:30
Yan
0c2e299ced
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
2017-06-26 16:37:02 +06:30
Nweni
04e44c4859
fixed conflict
2017-06-26 16:35:24 +06:30
Yan
813f2ecf2d
merge with settings_backend
2017-06-26 14:46:31 +06:30
Phyo
46ad87314a
Add color blue to orders
2017-06-26 14:39:25 +06:30
Yan
ecc9ab53ec
Merge branch 'cancan' of bitbucket.org:code2lab/sxrestaurant
2017-06-26 09:59:16 +06:30
Yan
30df25d78a
Merge branch 'master' into oqs
2017-06-23 19:22:07 +06:30
Yan
e9fb90d8a0
updating oqs
2017-06-23 19:00:49 +06:30
Yan
e01ecc6e0f
merge origin master
2017-06-23 17:53:53 +06:30
Nweni
81c50f220a
edit invoice
2017-06-23 17:37:08 +06:30
Phyo
68403617a5
Change Font and show status in origami
2017-06-23 11:14:48 +06:30
