Yan
|
0e7042f00f
|
merge with settings_backend
|
2017-06-18 12:30:06 +06:30 |
|
Yan
|
74c6f3cebc
|
Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant into staging
|
2017-06-18 12:10:30 +06:30 |
|
Phyo
|
e6cef8ef93
|
Redeem amount not cut bug Fix
|
2017-06-18 11:57:14 +06:30 |
|
Yan
|
f33f11df64
|
rescue member call and update oqs and js route bug
|
2017-06-18 03:20:19 +06:30 |
|
Yan
|
80320b6d3e
|
oqs updated
|
2017-06-18 00:45:39 +06:30 |
|
Aung Myo
|
b62d5349c6
|
assign queue and other bug
|
2017-06-18 00:03:09 +06:30 |
|
Phyo
|
b093a993ba
|
Zone and OQS
|
2017-06-17 18:00:59 +06:30 |
|
Nweni
|
e55ab32fad
|
Update
|
2017-06-17 16:00:56 +06:30 |
|
Yan
|
420e1b9cbc
|
all info details in oqs
|
2017-06-17 14:15:08 +06:30 |
|
Nweni
|
b2ed77947e
|
Update
|
2017-06-17 13:32:16 +06:30 |
|
Nweni
|
064f132906
|
Update
|
2017-06-17 12:13:38 +06:30 |
|
Nweni
|
1b7f90ccfe
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-17 11:35:26 +06:30 |
|
Nweni
|
29b76adba7
|
Update
|
2017-06-17 11:35:17 +06:30 |
|
superuser
|
9d57bd31dc
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-16 21:09:12 +06:30 |
|
Yan
|
2cf9c6947c
|
print for oqs
|
2017-06-16 21:06:33 +06:30 |
|
superuser
|
d4c087990b
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-16 19:56:56 +06:30 |
|
Yan
|
cd6ec67b94
|
Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-16 19:28:37 +06:30 |
|
Yan
|
9f3acad10d
|
update order for oqs
|
2017-06-16 19:26:21 +06:30 |
|
Aung Myo
|
c7efcb85d3
|
update sale
|
2017-06-16 19:19:33 +06:30 |
|
Aung Myo
|
b029cabeba
|
update show detail and order
|
2017-06-16 19:04:25 +06:30 |
|
Yan
|
0a496f2274
|
update order for oqs
|
2017-06-16 18:55:14 +06:30 |
|
Yan
|
741a7d0d64
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into staging
|
2017-06-16 18:23:12 +06:30 |
|
Yan
|
841f74b406
|
update footer in req bill
|
2017-06-16 18:22:18 +06:30 |
|
Nweni
|
49768900a9
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-16 18:22:13 +06:30 |
|
Nweni
|
9ff5122b72
|
Update
|
2017-06-16 18:21:57 +06:30 |
|
Aung Myo
|
cb43afc405
|
update bug sale
|
2017-06-16 18:04:39 +06:30 |
|
Yan
|
38ae8f8f86
|
Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant into staging
|
2017-06-16 13:45:23 +06:30 |
|
Yan
|
c40a2c78e7
|
oqs autoprint developing
|
2017-06-16 13:44:39 +06:30 |
|
Aung Myo
|
bec59a1d7b
|
update queue no print
|
2017-06-16 13:23:05 +06:30 |
|
Aung Myo
|
4cf9ce79ec
|
update receipt print member info
|
2017-06-16 10:51:50 +06:30 |
|
Aung Myo
|
0e21117f05
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-16 10:22:21 +06:30 |
|
Aung Myo
|
f06235c2cf
|
Merge branch 'crm'
|
2017-06-16 10:21:56 +06:30 |
|
Aung Myo
|
09a96372c8
|
update void and complete sale
|
2017-06-16 10:20:20 +06:30 |
|
superuser
|
6675e0f81c
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-16 10:06:02 +06:30 |
|
Yan
|
87c3546974
|
merge with master
|
2017-06-16 09:59:35 +06:30 |
|
superuser
|
2fe8f77bac
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-16 09:43:05 +06:30 |
|
Nweni
|
d92a0b0378
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-16 09:27:50 +06:30 |
|
Nweni
|
998ec1bd01
|
update api
|
2017-06-16 09:27:39 +06:30 |
|
Yan
|
0e820f0ee1
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-15 19:14:34 +06:30 |
|
Nweni
|
14e3ee93b5
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-15 19:13:15 +06:30 |
|
Nweni
|
b9e1a0694c
|
update api
|
2017-06-15 19:13:01 +06:30 |
|
Aung Myo
|
f0ea6f3c56
|
finish reprint
|
2017-06-15 19:07:33 +06:30 |
|
Yan
|
5eafe7094a
|
Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-15 18:35:00 +06:30 |
|
Aung Myo
|
b5743eb7a7
|
update customer bolder
|
2017-06-15 18:18:35 +06:30 |
|
Yan
|
03feae5b0f
|
fix get_order_items_details method in order_item and add taxes in receipt
|
2017-06-15 17:57:58 +06:30 |
|
Aung Myo
|
744e937f3d
|
update sale detail
|
2017-06-15 17:19:28 +06:30 |
|
Aung Myo
|
4098c99509
|
update membership in sale detail
|
2017-06-15 17:13:11 +06:30 |
|
Yan
|
ffafec0105
|
Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-15 16:47:25 +06:30 |
|
Yan
|
77049176f6
|
oqs and zone for seed
|
2017-06-15 16:47:04 +06:30 |
|
Aung Myo
|
f0d3f30d88
|
update order queue , sale void
|
2017-06-15 16:24:00 +06:30 |
|