Zin Lin Phyo
5fcfbdc020
fix conflit
2017-08-29 18:42:08 +06:30
Zin Lin Phyo
f03d8654e7
commission report
2017-08-29 18:36:46 +06:30
yamin
e84c080552
DataetimepickerInJuty
2017-08-29 13:20:32 +06:30
Zin Lin Phyo
1cbea173df
product commission transaction in commissioner
2017-08-28 18:17:22 +06:30
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
Nweni
44f02be4cb
nested form
2017-08-22 14:11:13 +06:30
yamin
8c6f06a667
for pull
2017-08-21 16:33:59 +06:30
Zin Lin Phyo
618f5f3b7c
commssions
2017-08-21 16:11:51 +06:30
yamin
3b5eb532d3
updateProduct
2017-08-21 16:06:34 +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
865c2c5cdd
update add order
2017-08-17 09:54:19 +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
edb4ab0425
Merge branch 'master' into menu_sync
2017-08-14 15:34:19 +06:30
Yan
739efa8baf
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant
2017-08-14 14:40:43 +06:30
Aung Myo
069ad16733
update oqs filtring
2017-08-14 13:42:47 +06:30
Yan
03a6208a76
add item set with scaffold
2017-08-11 17:41:10 +06:30
Aung Myo
10aae022d2
update oqs
2017-08-11 16:47:57 +06:30
Nweni
b0ad2049c5
dining_charges
2017-08-11 13:34:30 +06:30
Aung Myo
2c7a641d47
update oqs
2017-08-11 13:21:40 +06:30
Aung Myo
5684d5d0c7
update oqs
2017-08-11 12:15:30 +06:30
Aung Myo
9eaf04778c
update oqs
2017-08-11 10:25:09 +06:30
Aung Myo
362789a93e
update oqs
2017-08-10 18:19:07 +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
Aung Myo
a7cbea5dbb
update login To show dashboard screen with available features based on user type
2017-07-24 17:42:34 +06:30
Aung Myo
2d55ea0dab
update add order
2017-07-07 09:56:18 +06:30
Yan
d51b1a0b9e
disable cable and oqs qty can 0
2017-07-04 18:56:52 +06:30
superuser
60dee30046
api/bill_controller edited
2017-06-30 19:29:09 +06:30
Aung Myo
1d08954a76
update shift sale
2017-06-30 13:32:56 +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
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
superuser
9fa6ad920e
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
2017-06-26 20:02:39 +06:30
Yan
f60b3d554a
add table and order no in oqs
2017-06-26 16:23:00 +06:30
Yan
ecc9ab53ec
Merge branch 'cancan' of bitbucket.org:code2lab/sxrestaurant
2017-06-26 09:59:16 +06:30
Yan
a91816bb4e
qty edit in oqs
2017-06-25 22:41:26 +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
superuser
4dbc9b6134
:q
...
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
2017-06-23 18:00:18 +06:30
Yan
27ff8b89e7
merge with crm
2017-06-23 17:51:09 +06:30
Aung Myo
f5f0f9e077
update crm customer and bind customer and queue
2017-06-23 17:03:52 +06:30
Aung Myo
01e5b7ba6c
update authorize
2017-06-23 09:41:48 +06:30
superuser
ea74d52a6f
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
2017-06-22 18:26:36 +06:30
