Aung Myo
d715809b20
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into oqs
2017-09-01 16:57:04 +06:30
Aung Myo
fc5192157b
update
2017-09-01 16:55:51 +06:30
Yan
3726e8a7c3
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant
2017-08-31 18:09:35 +06:30
Zin Lin Phyo
0fbce1ca7c
fix conflit
2017-08-31 18:07:05 +06:30
Yan
e09559c508
merge with august spring but merge fail
2017-08-31 15:58:01 +06:30
Nweni
12c8be597d
Inventory Stock Check Print
2017-08-31 15:29:36 +06:30
Zin Lin Phyo
d1003e2f6a
move load_commissioner to origamin/product_commission
2017-08-31 14:15:09 +06:30
Yan
f50ca87e59
Merge branch 'addorder' of bitbucket.org:code2lab/sxrestaurant
2017-08-30 19:16:20 +06:30
Yan
51d8c986f1
merge with august_spring
2017-08-30 19:16:07 +06:30
Aung Myo
84d483cad2
update addorder
2017-08-30 18:41:54 +06:30
Phyo
2f0a7c11ad
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
2017-08-30 18:22:42 +06:30
Phyo
bf9f0cdbe7
CRUD Update for Promotion
2017-08-30 18:22:22 +06:30
Nweni
de45fb29b8
Update
2017-08-30 14:21:05 +06:30
Nweni
cabc78c373
inventory
2017-08-30 14:19:24 +06:30
Yan
76fb16615d
merge with august sprint for commission
2017-08-29 18:44:31 +06:30
Yan
7c5db11df5
merge with addorder
2017-08-29 18:08:05 +06:30
Aung Myo
2e48c1529e
update addorder
2017-08-29 17:58:34 +06:30
yamin
e84c080552
DataetimepickerInJuty
2017-08-29 13:20:32 +06:30
Yan
bbd9a50868
merge with august spring
2017-08-28 18:33:49 +06:30
Yan
6472a2deac
Merge branch 'addorder' of bitbucket.org:code2lab/sxrestaurant
2017-08-28 18:27:58 +06:30
Aung Myo
1372285c7f
update add order
2017-08-28 18:27:22 +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
yamin
81c928b375
InJutyUpdate
2017-08-28 17:55:47 +06:30
Zin Lin Phyo
36b4b15688
added commission report
2017-08-28 10:52:14 +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
yamin
29a5062b85
InJutiesUpdate
2017-08-25 13:06:25 +06:30
Nweni
6aaea69f0a
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
2017-08-25 09:41:44 +06:30
Nweni
b99c503afa
inventory
2017-08-25 09:40:59 +06:30
yamin
4791656a7d
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
2017-08-24 18:26:28 +06:30
yamin
7004637027
In_juties
2017-08-24 18:24:57 +06:30
Nweni
81f430b5c6
inventory setup
2017-08-24 18:04:42 +06:30
Zin Lin Phyo
874a9b60be
create InJuty
2017-08-23 15:02:27 +06:30
Zin Lin Phyo
fd1bfb7c0e
load commissioner
2017-08-23 10:24:26 +06:30
Phyo
e3c1dd216a
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
2017-08-21 17:40:44 +06:30
Phyo
e9ba56826c
Promotion Product Add
2017-08-21 17:38:07 +06:30
yamin
b7f9d56221
fix conflit
2017-08-21 16:35:15 +06:30
yamin
8c6f06a667
for pull
2017-08-21 16:33:59 +06:30
Zin Lin Phyo
f26bc83b42
move commission to origami
2017-08-21 16:31:04 +06:30
yamin
25e6039a9f
CRUDcommissioner
2017-08-21 16:12:59 +06:30
Zin Lin Phyo
e4e2c306a4
commssion scaffold
2017-08-21 16:11: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
Yan
3160aab399
merge with addorder
2017-08-17 18:59:22 +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
