Yan
0ad958d8a8
del migrating no need commission
2017-11-07 11:03:19 +06:30
Yan
4fa0705f1c
Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant
2017-11-07 10:32:48 +06:30
Aung Myo
b48625e25e
update commission and seed for font
2017-11-07 10:31:10 +06:30
Yan
d5efe1402f
add survey
2017-11-06 18:23:38 +06:30
yamin
382e9fd4fa
inventory definition.coffee
2017-10-23 11:40:37 +06:30
yamin
1aea52619a
UI change
2017-10-23 11:38:10 +06:30
Yan
95ef534b04
add cashier zone in ui
2017-10-23 10:53:22 +06:30
Yan
bcd86714e2
add cashier zones
2017-10-23 09:57:26 +06:30
Yan
4ab89efaf2
add font for print setting
2017-10-11 15:16:40 +06:30
Yan
8966f290b5
pull origin master
2017-09-18 13:53:28 +06:30
Zin Lin Phyo
2ee08e943d
for pull
2017-08-31 10:22:21 +06:30
Nweni
de45fb29b8
Update
2017-08-30 14:21:05 +06:30
Nweni
cabc78c373
inventory
2017-08-30 14:19:24 +06:30
Zin Lin Phyo
63d97cce26
fix conflit
2017-08-28 18:22:32 +06:30
Zin Lin Phyo
1cbea173df
product commission transaction in commissioner
2017-08-28 18:17:22 +06:30
Yan
8577754c0f
add item instance code to order item
2017-08-28 14:19:40 +06:30
Zin Lin Phyo
3131823ae0
commission update -> change route under settings
2017-08-28 09:46:36 +06:30
Nweni
c9998c0b65
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
2017-08-28 09:37:58 +06:30
Nweni
83ec17a3df
inventory development
2017-08-28 09:37:36 +06:30
Zin Lin Phyo
ef9fe32b5b
fix conflit
2017-08-25 13:46:50 +06:30
Zin Lin Phyo
b4eb27b8a9
commission in sale edit
2017-08-25 13:44:22 +06:30
Nweni
81f430b5c6
inventory setup
2017-08-24 18:04:42 +06:30
Nweni
44459ce4b5
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
2017-08-23 17:37:47 +06:30
Zin Lin Phyo
874a9b60be
create InJuty
2017-08-23 15:02:27 +06:30
Yan
744065d3e9
merge with august_spring
2017-08-22 14:52:14 +06:30
Zin Lin Phyo
74c2955ef0
create productCommission
2017-08-22 11:08:49 +06:30
Yan
2b0dcd4ab9
update and fix
2017-08-21 16:50: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
Yan
a1df5a0dbc
update menu_sync
2017-08-18 19:46:43 +06:30
Yan
48461da9ea
add fields for Menu Sync
2017-08-18 11:24:38 +06:30
Yan
29b3f94573
add menu api
2017-08-17 18:55:13 +06:30
Yan
f2829fab0f
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant
2017-08-17 13:50:24 +06:30
Phyo
0138ae2efa
Fix Conflict
2017-08-16 18:38:41 +06:30
Phyo
fc2927b341
Promotion CRUD
2017-08-16 18:36:23 +06:30
Yan
0eee1fd0af
menu ui update
2017-08-16 18:26:30 +06:30
yamin
4fc748e877
CRUDforProducts
2017-08-16 18:19:20 +06:30
Phyo
73cceaf482
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
2017-08-16 11:00:51 +06:30
Phyo
db43ae186c
DB for promtion, promotion product,product
2017-08-16 11:00:37 +06:30
Yan
20bba0f659
merge with august_spring
2017-08-15 17:04:28 +06:30
Nweni
2da60ce6e3
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
2017-08-15 11:15:41 +06:30
Nweni
e5a685f36e
room charges
2017-08-15 11:14:38 +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
yamin
fa68bcff69
removeDBcolsanddbparams
2017-08-14 14:26:16 +06:30
Yan
03a6208a76
add item set with scaffold
2017-08-11 17:41:10 +06:30
Yan
be71d187b0
update menu
2017-08-11 15:00:24 +06:30
Yan
b7cde3125f
add item set and relation
2017-08-11 13:44:25 +06:30
Yan
b7c49f5f60
remove item set migrateion
2017-08-11 13:34:58 +06:30
