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 |
|
Aung Myo
|
a77065ac3d
|
Merge branch 'crm'
|
2017-06-15 14:02:44 +06:30 |
|
Aung Myo
|
f83d11e379
|
update customer
|
2017-06-15 14:02:09 +06:30 |
|
Yan
|
bd94e808d4
|
print format
|
2017-06-15 13:24:37 +06:30 |
|
Aung Myo
|
5878999ead
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-15 13:19:13 +06:30 |
|
Aung Myo
|
ed3f97a2af
|
upadte customer and sale void
|
2017-06-15 13:17:58 +06:30 |
|
Phyo
|
215239ec0f
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-15 12:30:33 +06:30 |
|
Phyo
|
5675f0e48b
|
Payment Bug fix
|
2017-06-15 12:29:36 +06:30 |
|
Yan
|
061c06b3c3
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-15 11:25:49 +06:30 |
|
Yan
|
cca890ffdd
|
disable auto reload origami
|
2017-06-15 11:25:13 +06:30 |
|
Yan
|
41572d5360
|
add sale reason in seed
|
2017-06-15 11:12:50 +06:30 |
|
Phyo
|
136ca65233
|
Back Button in Payment
|
2017-06-15 11:10:11 +06:30 |
|
Phyo
|
69320d0752
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-15 11:06:32 +06:30 |
|
Phyo
|
a600838c50
|
Bug Fix with Production
|
2017-06-15 11:05:13 +06:30 |
|
Yan
|
2efd6fc410
|
merge with origin master
|
2017-06-15 10:53:42 +06:30 |
|
Yan
|
e133595d49
|
authentication fixed
|
2017-06-15 10:48:32 +06:30 |
|
Aung Myo
|
7dffd668ea
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm
|
2017-06-15 10:21:26 +06:30 |
|
Aung Myo
|
8cb40783a4
|
update requestby in sail
|
2017-06-15 10:20:26 +06:30 |
|
Nweni
|
ed34088907
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-15 10:10:19 +06:30 |
|
Nweni
|
5e8bc9c013
|
Update
|
2017-06-15 10:10:02 +06:30 |
|
Phyo
|
2a492345a4
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-15 09:50:43 +06:30 |
|
Phyo
|
c6f976bab3
|
Payment via card Bug fix
|
2017-06-15 09:49:44 +06:30 |
|
Aung Myo
|
29d5b134da
|
fixed conflict
|
2017-06-15 09:46:01 +06:30 |
|