Yan
|
e9e7aec028
|
update item edit
|
2017-09-01 16:03:55 +06:30 |
|
Yan
|
3726e8a7c3
|
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant
|
2017-08-31 18:09:35 +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 |
|
Zin Lin Phyo
|
675ebd56a7
|
assign in_juty in sale edit
|
2017-08-30 15:57:15 +06:30 |
|
Yan
|
c7018ee774
|
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant
|
2017-08-30 11:14:11 +06:30 |
|
Zin Lin Phyo
|
df4caa288d
|
jquery date-time picker
|
2017-08-30 10:46:46 +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 |
|
yamin
|
0369cd6646
|
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
|
2017-08-28 17:56:24 +06:30 |
|
yamin
|
81c928b375
|
InJutyUpdate
|
2017-08-28 17:55:47 +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 |
|
Yan
|
812a32a89f
|
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant
|
2017-08-25 18:57:06 +06:30 |
|
Aung Myo
|
2522950019
|
update create order function
|
2017-08-25 18:55:34 +06:30 |
|
yamin
|
61817ce178
|
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
|
2017-08-25 18:49:02 +06:30 |
|
yamin
|
57d668d122
|
InJutyIndexform
|
2017-08-25 18:48:34 +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 |
|
Yan
|
836fa6cddb
|
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant
|
2017-08-24 18:33:21 +06:30 |
|
yamin
|
7004637027
|
In_juties
|
2017-08-24 18:24:57 +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 |
|
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 |
|
Zin Lin Phyo
|
f2ddcb9e4b
|
readded commission
|
2017-08-24 10:05:07 +06:30 |
|
Yan
|
18dc0300c4
|
Merge branch 'addorder' of bitbucket.org:code2lab/sxrestaurant
|
2017-08-23 19:55:37 +06:30 |
|
Aung Myo
|
352037641b
|
update jade integration
|
2017-08-23 19:55:17 +06:30 |
|
Aung Myo
|
07b13d8f87
|
update jade integration
|
2017-08-23 19:46:00 +06:30 |
|
yamin
|
d88199150e
|
CRUDIn_Juties
|
2017-08-23 18:14:31 +06:30 |
|
Zin Lin Phyo
|
784da2cf09
|
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
* 'august_spring' of bitbucket.org:code2lab/sxrestaurant:
UpdateCommissioner
|
2017-08-23 15:24:50 +06:30 |
|
Zin Lin Phyo
|
f205d9910e
|
readded commissions_controller
|
2017-08-23 15:19:55 +06:30 |
|
yamin
|
111872c158
|
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
|
2017-08-23 15:04:34 +06:30 |
|
yamin
|
621dfb03fe
|
UpdateCommissioner
|
2017-08-23 15:03:53 +06:30 |
|
Zin Lin Phyo
|
874a9b60be
|
create InJuty
|
2017-08-23 15:02:27 +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 |
|
Zin Lin Phyo
|
74c2955ef0
|
create productCommission
|
2017-08-22 11:08:49 +06:30 |
|
Zin Lin Phyo
|
1af178fecb
|
update ui commission & commissioner
|
2017-08-22 09:51:08 +06:30 |
|
yamin
|
4e29cd7cdd
|
CRUDcommission
|
2017-08-21 18:14:36 +06:30 |
|
yamin
|
9d424df9fd
|
updateCommissioner
|
2017-08-21 17:31:17 +06:30 |
|
yamin
|
b7f9d56221
|
fix conflit
|
2017-08-21 16:35:15 +06:30 |
|
Zin Lin Phyo
|
f26bc83b42
|
move commission to origami
|
2017-08-21 16:31:04 +06:30 |
|
yamin
|
dc95f78202
|
Merge branch 'master' into august_spring
|
2017-08-21 10:12:47 +06:30 |
|
Phyo
|
8caf4b2612
|
Coupon / Voucher data change
|
2017-08-21 10:09:23 +06:30 |
|