Aung Myo
|
a9d31935a1
|
update addorder bugs
|
2017-09-06 13:22:46 +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 |
|
Yan
|
6a04f2b213
|
del menu images
|
2017-09-05 14:17:00 +06:30 |
|
Yan
|
995ee8298e
|
Merge branch 'oqs' of bitbucket.org:code2lab/sxrestaurant
|
2017-09-05 14:14:10 +06:30 |
|
Yan
|
721f142971
|
Merge branch 'master-bug-fix' of bitbucket.org:code2lab/sxrestaurant
|
2017-09-05 14:13:26 +06:30 |
|
Yan
|
3dc7fea339
|
date format fix for promotion
|
2017-09-05 14:12:53 +06:30 |
|
Aung Myo
|
4a85039170
|
update oqs action cable for order cahnnel and oqs channel
|
2017-09-05 14:07:20 +06:30 |
|
Yan
|
0dba573607
|
Merge branch 'master-bug-fix'
|
2017-09-05 13:54:09 +06:30 |
|
Yan
|
d0a527d1ee
|
code review and fix
|
2017-09-05 13:53:06 +06:30 |
|
Yan
|
c64541a410
|
Merge branch 'master-bug-fix'
|
2017-09-05 10:38:57 +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
|
081710e71c
|
Merge branch 'master-bug-fix'
|
2017-09-04 18:04:17 +06:30 |
|
Yan
|
e6ee2c43df
|
add public/image to gitignore
|
2017-09-04 18:01:48 +06:30 |
|
Yan
|
a4884c9bea
|
item instance code add to sale_item
|
2017-09-04 15:10:26 +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 |
|
Yan
|
fc6dd212c3
|
image add in gitignore
|
2017-09-04 14:53:02 +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
|
2330a1a33e
|
calculate commission in sale_edit, void, foc
|
2017-09-04 12:09:04 +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
|
e9e7aec028
|
update item edit
|
2017-09-01 16:03:55 +06:30 |
|
Nweni
|
09ba513c1c
|
fixed conflict
|
2017-09-01 09:42:10 +06:30 |
|
Nweni
|
ed17e5fd32
|
Update
|
2017-09-01 09:40:50 +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 |
|
Zin Lin Phyo
|
0584530224
|
for pull
|
2017-08-31 18:06:13 +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
|
a1341d0b10
|
fixed conflict
|
2017-08-31 15:30:02 +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 |
|
Aung Myo
|
2be93e413d
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into oqs
|
2017-08-31 13:48:24 +06:30 |
|
Aung Myo
|
122c4b72fd
|
updat
|
2017-08-31 13:47:55 +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 |
|
Zin Lin Phyo
|
4b74f2c128
|
fix conflit
|
2017-08-31 10:23:19 +06:30 |
|
Zin Lin Phyo
|
2ee08e943d
|
for pull
|
2017-08-31 10:22:21 +06:30 |
|
Phyo
|
012b771435
|
Set Auto Generate ID to exact 16
|
2017-08-31 10:07:44 +06:30 |
|
Nweni
|
65675a6683
|
Update
|
2017-08-31 09:22:40 +06:30 |
|