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
Yan
88eb1d6c64
update seed
2017-08-17 10:43:45 +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
Nweni
b0ad2049c5
dining_charges
2017-08-11 13:34:30 +06:30
Yan
b0f2bbe899
add pivot table for menu
2017-08-11 11:28:13 +06:30
Yan
2000eb2d6c
add pivot table for menu
2017-08-11 11:27:53 +06:30
Yan
5ffb715bd1
add menu_item_set
2017-08-10 18:47:29 +06:30
Yan
338c420850
update fix for customer
2017-08-10 18:02:50 +06:30
Yan
99946deea3
update fix for customer
2017-08-10 18:01:37 +06:30
Yan
c522ba3cab
merge with staging
2017-08-10 13:42:08 +06:30
Yan
fb8c67f058
fix for customer tax
2017-08-10 13:38:39 +06:30
Aung Myo
80d13ce1f9
finished sale summary quick view
2017-08-10 11:59:15 +06:30
Yan
0fc2fb1d98
calc tax by user taxes
2017-08-09 15:32:33 +06:30
Yan
1685713ff5
add customer tax
2017-08-08 18:02:05 +06:30
Yan
f46d786859
update crm
2017-08-08 14:29:48 +06:30
Yan
c096e82148
update shop in seed for osaka
2017-08-02 14:33:03 +06:30
Aung Myo
2d6841a4c4
update
2017-07-31 18:33:47 +06:30
Yan
124528c138
Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant
2017-07-26 18:40:11 +06:30
Yan
ad2dfa2ee0
crm updated
2017-07-26 18:39:46 +06:30
Aung Myo
1de6cc906c
update rounding adj for osaka
2017-07-26 16:35:34 +06:30
Yan
e693b60945
bind member for already register member
2017-07-26 16:00:15 +06:30
Yan
d01ec184f5
edit merchant code for bitp
2017-07-25 09:53:25 +06:30
Yan
bf9b977cd0
membership update
2017-07-24 19:24:43 +06:30
Yan
b37cef46bd
Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant into osaka
2017-07-18 18:07:26 +06:30
