Aung Myo
|
35b9a9e02a
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into oqs
|
2017-09-27 11:26:27 +06:30 |
|
Aung Myo
|
ddf466d3fe
|
update addorder available and max qty
|
2017-09-27 11:26:13 +06:30 |
|
Aung Myo
|
4779b6a19f
|
update
|
2017-09-19 11:09:23 +06:30 |
|
Yan
|
3e0371a9fb
|
done
|
2017-09-15 14:20:53 +06:30 |
|
Aung Myo
|
07ea214eee
|
update other payment alert box
|
2017-09-14 17:49:11 +06:30 |
|
Aung Myo
|
e878a6387e
|
update member discount
|
2017-09-14 17:36:00 +06:30 |
|
Aung Myo
|
abde6745a4
|
update addorder modefined
|
2017-09-13 12:27:37 +06:30 |
|
Aung Myo
|
bbcce13a2e
|
update addorder
|
2017-09-13 09:21:35 +06:30 |
|
Yan
|
8ec820a624
|
bill cable add and add ... for origami pages
|
2017-09-11 16:38:32 +06:30 |
|
Yan
|
c3b38a860c
|
bill cable add and add ... for origami pages
|
2017-09-11 16:37:50 +06:30 |
|
Yan
|
e9a305b573
|
remove auto refresh in origami
|
2017-09-07 13:55:40 +06:30 |
|
Yan
|
a50becb365
|
merge with august_spring
|
2017-09-06 18:32:45 +06:30 |
|
Aung Myo
|
a9d31935a1
|
update addorder bugs
|
2017-09-06 13:22:46 +06:30 |
|
Zin Lin Phyo
|
784e740da3
|
rename in_juty to in_duty
|
2017-09-06 11:18:02 +06:30 |
|
Aung Myo
|
d1db57e9b5
|
update oqs action cable sorting
|
2017-09-05 18:06:57 +06:30 |
|
Yan
|
995ee8298e
|
Merge branch 'oqs' of bitbucket.org:code2lab/sxrestaurant
|
2017-09-05 14:14:10 +06:30 |
|
Aung Myo
|
eeb2a91ce9
|
update oqs action cable for order cahnnel and oqs channel
|
2017-09-05 09:41:05 +06:30 |
|
Yan
|
008da6ee47
|
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into master-bug-fix
|
2017-09-04 14:58:30 +06:30 |
|
Zin Lin Phyo
|
6c94ba5457
|
in_juty ui update
|
2017-09-04 14:47:58 +06:30 |
|
Yan
|
82120e2ba1
|
updated commission for sale edit
|
2017-09-04 13:13:08 +06:30 |
|
Zin Lin Phyo
|
98dae6d712
|
show and update changes in commission and report
|
2017-09-04 10:24:24 +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
|
2b3c294327
|
Merge branch 'addorder' of bitbucket.org:code2lab/sxrestaurant
|
2017-08-31 12:10:31 +06:30 |
|
Aung Myo
|
449969fa5b
|
update addorder
|
2017-08-31 11:22:12 +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 |
|
Yan
|
3e8ead6a32
|
ui code review and edited
|
2017-08-30 19:04:06 +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
|
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 |
|
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 |
|