Phyo
087c120cc7
tax bug fix
2017-08-28 14:24:53 +06:30
Yan
8577754c0f
add item instance code to order item
2017-08-28 14:19:40 +06:30
Zin Lin Phyo
4fd4fdaeb7
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
...
* 'august_spring' of bitbucket.org:code2lab/sxrestaurant:
Dining Charges Bug Fix
InJutyIndexform
2017-08-28 09:47:06 +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
Yan
812a32a89f
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant
2017-08-25 18:57:06 +06:30
Yan
8b79cdef7b
add doc in readme.md
2017-08-25 18:56:46 +06:30
Phyo
a0fe336589
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
2017-08-25 18:54:16 +06:30
Phyo
44105a5f3b
Dining Charges Bug Fix
2017-08-25 18:52:35 +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
Yan
836fa6cddb
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant
2017-08-24 18:33:21 +06:30
Phyo
d1f0356851
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
2017-08-24 18:32:14 +06:30
Phyo
8b33a94d93
Promotion Tax bug fix
2017-08-24 18:31:53 +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
Yan
d1f5c94be8
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant
2017-08-24 15:28:56 +06:30
Yan
412bfea5b3
Merge branch 'addorder' of bitbucket.org:code2lab/sxrestaurant
2017-08-24 15:21:46 +06:30
Phyo
0670a6a05d
Promotion Product Bug Fix
2017-08-24 14:37:11 +06:30
Aung Myo
3314b3554f
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into addorder
2017-08-24 13:30:02 +06:30
Aung Myo
7b90acd2c1
update jade integration card use for all shop
2017-08-24 11:29:04 +06:30
Yan
18dc0300c4
Merge branch 'addorder' of bitbucket.org:code2lab/sxrestaurant
2017-08-23 19:55:37 +06:30
Yan
1a091929b0
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant
2017-08-23 19:51:55 +06:30
Aung Myo
07b13d8f87
update jade integration
2017-08-23 19:46:00 +06:30
Yan
55f041a252
add checksum for menu sync
2017-08-23 18:59:23 +06:30
yamin
258ab711e1
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
2017-08-23 18:15:36 +06:30
yamin
d88199150e
CRUDIn_Juties
2017-08-23 18:14:31 +06:30
Nweni
688ce932cc
promotion
2017-08-23 18:07:58 +06:30
Nweni
44459ce4b5
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
2017-08-23 17:37:47 +06:30
Nweni
de769f3faf
promotion
2017-08-23 17:37:13 +06:30
Zin Lin Phyo
d56132f6f4
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
...
* 'august_spring' of bitbucket.org:code2lab/sxrestaurant:
Dining Charges Fix for free time
2017-08-23 15:03:16 +06:30
Zin Lin Phyo
874a9b60be
create InJuty
2017-08-23 15:02:27 +06:30
Phyo
790b7939fc
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
2017-08-23 13:59:52 +06:30
Phyo
248b807633
Dining Charges Fix for free time
2017-08-23 13:59:27 +06:30
Yan
911b941793
fix member sync and menu json
2017-08-23 13:43:31 +06:30
Zin Lin Phyo
3132bc7c34
commission update
2017-08-23 11:14:24 +06:30
Zin Lin Phyo
fd1bfb7c0e
load commissioner
2017-08-23 10:24:26 +06:30
Nweni
eedf6c39a1
promotion + merge with master
2017-08-23 10:12:41 +06:30
Nweni
28dab9d3e0
promotion
2017-08-23 09:48:15 +06:30
Zin Lin Phyo
74c2955ef0
create productCommission
2017-08-22 11:08:49 +06:30
Phyo
5a1c161771
Promotion Relation with PromotionProduct
2017-08-21 17:46:16 +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
8c6f06a667
for pull
2017-08-21 16:33:59 +06:30
yamin
25e6039a9f
CRUDcommissioner
2017-08-21 16:12: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
