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 |
|
superuser
|
9a93f2e622
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-15 15:06:54 +06:30 |
|
Yan
|
2484378de9
|
booking order for api fixed
|
2017-06-15 14:55:33 +06:30 |
|
Nweni
|
739e7bc4dc
|
udpate
|
2017-06-15 14:53:56 +06:30 |
|
Nweni
|
11b948e6c4
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-15 14:53:02 +06:30 |
|
Nweni
|
0bdecb737c
|
udpate
|
2017-06-15 14:52:52 +06:30 |
|
Yan
|
5040404725
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-15 14:52:50 +06:30 |
|
Yan
|
18e855f5f9
|
new order for booking fixed
|
2017-06-15 14:52:23 +06:30 |
|
Phyo
|
8cab49e964
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-15 14:44:41 +06:30 |
|
Yan
|
0778df4e80
|
order fix for booking
|
2017-06-15 14:44:27 +06:30 |
|
Phyo
|
c30a3a1ea9
|
Nett Bug Fix
|
2017-06-15 14:44:25 +06:30 |
|
Aung Myo
|
a48ff7745d
|
update customer
|
2017-06-15 14:21:20 +06:30 |
|
superuser
|
fec8c43dae
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-15 14:19:55 +06:30 |
|
Aung Myo
|
addf3603ff
|
update customer
|
2017-06-15 14:19:31 +06:30 |
|
Aung Myo
|
5d63eb359e
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-15 14:14:08 +06:30 |
|
Aung Myo
|
441bd847ec
|
update customer
|
2017-06-15 14:13:40 +06:30 |
|
superuser
|
78bad72ced
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-15 14:08:01 +06:30 |
|
Phyo
|
35048af451
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-15 14:07:57 +06:30 |
|
superuser
|
37dd8c9e5a
|
before pull
|
2017-06-15 14:07:54 +06:30 |
|
Phyo
|
aa4391af7d
|
Request bill from mobile
|
2017-06-15 14:07:43 +06:30 |
|
Aung Myo
|
71c3b2f451
|
update tether
|
2017-06-15 14:06:26 +06:30 |
|