Zin Lin Phyo
|
2e53b72574
|
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
* 'august_spring' of bitbucket.org:code2lab/sxrestaurant:
Timepicker Bug Fix
Show data in Edit
Promotion Destory Bug Fix
|
2017-09-06 18:28:09 +06:30 |
|
Zin Lin Phyo
|
5e1e0cd5b9
|
stock_check report template
|
2017-09-06 18:27:58 +06:30 |
|
Phyo
|
9d47414292
|
Timepicker Bug Fix
|
2017-09-06 18:03:53 +06:30 |
|
Phyo
|
4ca3b708c4
|
Show data in Edit
|
2017-09-06 17:01:33 +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 |
|
Aung Myo
|
bb6e938f47
|
update oqs action cable for order cahnnel and oqs channel
|
2017-09-05 16:51:41 +06:30 |
|
Zin Lin Phyo
|
31021813b0
|
inventory list and stock check
|
2017-09-05 16:47:50 +06:30 |
|
Yan
|
995ee8298e
|
Merge branch 'oqs' of bitbucket.org:code2lab/sxrestaurant
|
2017-09-05 14:14:10 +06:30 |
|
Aung Myo
|
4a85039170
|
update oqs action cable for order cahnnel and oqs channel
|
2017-09-05 14:07:20 +06:30 |
|
Yan
|
d0a527d1ee
|
code review and fix
|
2017-09-05 13:53:06 +06:30 |
|
Yan
|
4b4f44f37e
|
code reviews and add bootstrp font
|
2017-09-05 10:38:37 +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
|
c2d86cb17c
|
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
* 'august_spring' of bitbucket.org:code2lab/sxrestaurant:
Promotion multiple order
|
2017-09-04 10:24:54 +06:30 |
|
Zin Lin Phyo
|
98dae6d712
|
show and update changes in commission and report
|
2017-09-04 10:24:24 +06:30 |
|
Phyo
|
2eaf891748
|
Promotion multiple order
|
2017-09-04 10:22:54 +06:30 |
|
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 |
|
Phyo
|
e35378bd36
|
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring
|
2017-08-31 18:05:43 +06:30 |
|
Yan
|
db248d69cd
|
Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant
|
2017-08-31 17:18:23 +06:30 |
|
yamin
|
21a9f77c59
|
Update
|
2017-08-31 17:05:07 +06:30 |
|
yamin
|
b311df9a0b
|
promotionDay
|
2017-08-31 16:59:32 +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 |
|
Phyo
|
dd19b52ebd
|
Promotion Index View Change
|
2017-08-31 14:03:43 +06:30 |
|
Yan
|
2b3c294327
|
Merge branch 'addorder' of bitbucket.org:code2lab/sxrestaurant
|
2017-08-31 12:10:31 +06:30 |
|
Yan
|
2399f1d494
|
update form attr name to attr id to instances
|
2017-08-31 11:41:38 +06:30 |
|
Aung Myo
|
449969fa5b
|
update addorder
|
2017-08-31 11:22:12 +06:30 |
|
Phyo
|
012b771435
|
Set Auto Generate ID to exact 16
|
2017-08-31 10:07:44 +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 |
|
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 |
|
Zin Lin Phyo
|
5a0ca4b39d
|
fix conflit
|
2017-08-30 15:58:06 +06:30 |
|
Zin Lin Phyo
|
675ebd56a7
|
assign in_juty in sale edit
|
2017-08-30 15:57:15 +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
|
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 |
|
Zin Lin Phyo
|
4b97cd530e
|
commission report export excel
|
2017-08-29 23:05:03 +06:30 |
|
Yan
|
76fb16615d
|
merge with august sprint for commission
|
2017-08-29 18:44:31 +06:30 |
|