Min Zeya Phyo
|
ee651763b7
|
shift close and payment journal
|
2017-06-28 10:34:42 +06:30 |
|
Yan
|
58a8cdec6e
|
still dev dis
|
2017-06-27 18:32:58 +06:30 |
|
Aung Myo
|
53ff3989b5
|
update merge cancan
|
2017-06-27 16:55:56 +06:30 |
|
Aung Myo
|
5a52183846
|
update pull master
|
2017-06-27 16:48:05 +06:30 |
|
Yan
|
464e72012b
|
waiter and cashier in api/bill_controller
|
2017-06-27 15:26:02 +06:30 |
|
Aung Myo
|
f762664912
|
update bill
|
2017-06-27 14:16:48 +06:30 |
|
Zin Lin Phyo
|
bce4380d70
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-27 14:04:41 +06:30 |
|
Zin Lin Phyo
|
1c65a38b70
|
fix conflit
|
2017-06-27 14:04:29 +06:30 |
|
Nweni
|
c6f482da83
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-27 14:02:54 +06:30 |
|
Nweni
|
df722de0e7
|
billed
|
2017-06-27 14:02:44 +06:30 |
|
superuser
|
873f847a67
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-27 12:11:17 +06:30 |
|
superuser
|
e85f22fb79
|
update for bill
|
2017-06-27 12:11:07 +06:30 |
|
Yan
|
4f78c63b63
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-27 11:53:46 +06:30 |
|
Yan
|
e38886790c
|
not show price 0 fixed
|
2017-06-27 11:52:51 +06:30 |
|
Zin Lin Phyo
|
8d8f7b9093
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-27 11:35:48 +06:30 |
|
Zin Lin Phyo
|
bcd44db9a2
|
multiple invoice void
|
2017-06-27 11:35:36 +06:30 |
|
Nweni
|
463e8e5875
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-27 10:28:58 +06:30 |
|
Nweni
|
535a5825fb
|
get update
|
2017-06-27 10:28:47 +06:30 |
|
Aung Myo
|
4c13be257b
|
update authroize
|
2017-06-26 22:45:34 +06:30 |
|
Min Zeya Phyo
|
1ea9125f80
|
Merge branch 'master' of ssh://bitbucket.org/code2lab/sxrestaurant
# Conflicts:
# Gemfile.lock
# app/views/layouts/application.html.erb
|
2017-06-26 21:57:55 +06:30 |
|
Min Zeya Phyo
|
b607154037
|
New Login form
|
2017-06-26 21:56:13 +06:30 |
|
superuser
|
c743fac296
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-26 20:59:45 +06:30 |
|
Yan
|
a236c94910
|
mobile bill updated
|
2017-06-26 20:58:12 +06:30 |
|
superuser
|
9fa6ad920e
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-26 20:02:39 +06:30 |
|
Aung Myo
|
0726af072e
|
update cancan
|
2017-06-26 19:49:02 +06:30 |
|
Yan
|
6f741e0a0c
|
Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-26 19:28:21 +06:30 |
|
Aung Myo
|
376af85c64
|
update credit
|
2017-06-26 19:02:36 +06:30 |
|
Yan
|
ef8f280d0e
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-26 18:46:16 +06:30 |
|
Yan
|
034c9932a6
|
Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-26 18:45:55 +06:30 |
|
Yan
|
cb77c771b8
|
oqs update
|
2017-06-26 18:45:20 +06:30 |
|
Aung Myo
|
f3417a61c0
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm
|
2017-06-26 18:16:03 +06:30 |
|
Aung Myo
|
1000968a8f
|
update
|
2017-06-26 18:14:36 +06:30 |
|
Zin Lin Phyo
|
9d76e1313a
|
overall void update
|
2017-06-26 18:13:43 +06:30 |
|
Zin Lin Phyo
|
5489da2066
|
route conflit fix
|
2017-06-26 18:02:08 +06:30 |
|
Zin Lin Phyo
|
feb1d66257
|
overall void
|
2017-06-26 18:00:48 +06:30 |
|
Aung Myo
|
02e3ebefda
|
update receipt
|
2017-06-26 17:56:31 +06:30 |
|
Nweni
|
089848ed4a
|
credit note payment
|
2017-06-26 17:49:55 +06:30 |
|
Yan
|
e878275c1b
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-26 17:10:25 +06:30 |
|
Nweni
|
d4983fabf5
|
item void
|
2017-06-26 17:07:17 +06:30 |
|
Yan
|
adf06cf6f5
|
Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-26 17:02:25 +06:30 |
|
Aung Myo
|
6e77a71946
|
update customer seed shop and receipt bill
|
2017-06-26 16:50:04 +06:30 |
|
Yan
|
4e5ca54eee
|
Merge branch 'oqs' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-26 16:38:15 +06:30 |
|
Yan
|
0c2e299ced
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-26 16:37:02 +06:30 |
|
Nweni
|
20afabd86d
|
item void
|
2017-06-26 16:34:03 +06:30 |
|
Yan
|
f60b3d554a
|
add table and order no in oqs
|
2017-06-26 16:23:00 +06:30 |
|
superuser
|
1d96eb1d48
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-26 15:38:31 +06:30 |
|
Yan
|
813f2ecf2d
|
merge with settings_backend
|
2017-06-26 14:46:31 +06:30 |
|
Yan
|
e1c981e8c2
|
merge with crm
|
2017-06-26 14:23:56 +06:30 |
|
Phyo
|
5017549f86
|
Merge branch 'master' into settings_backend
|
2017-06-26 11:13:06 +06:30 |
|
Phyo
|
6e49f91b89
|
Multiple Invoices Phase 1
|
2017-06-26 11:10:49 +06:30 |
|