Commit Graph

538 Commits

Author SHA1 Message Date
Yan
97c70fb72b merge with crm 2017-07-01 20:11:52 +06:30
Yan
6fe2de877c remove add order 2017-07-01 20:08:57 +06:30
Aung Myo
c26b80066b update shift close print 2017-07-01 20:05:26 +06:30
Yan
e9b1845ed2 saturday fixed 2017-07-01 20:02:14 +06:30
Yan
51a779cbee add zone with oqs and tax calculte method update 2017-07-01 19:11:04 +06:30
Aung Myo
740f585a31 update rounding adj 2017-07-01 18:19:41 +06:30
Nweni
5f3708e11d menu updated | edit qty updated 2017-07-01 17:15:12 +06:30
Nweni
99986b1fb9 open cashier clear 2017-07-01 15:30:06 +06:30
Nweni
cb753ed4e4 shift | cash In | cash out 2017-07-01 15:25:34 +06:30
Nweni
abefd1f8f2 Update 2017-07-01 14:55:37 +06:30
Aung Myo
40a2347c1b update report 2017-07-01 11:10:08 +06:30
Nweni
23f8430032 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-07-01 09:46:44 +06:30
Nweni
c589f11758 shift sale 2017-07-01 09:46:14 +06:30
Aung Myo
2548fdcac1 update receipt bill 2017-06-30 18:02:17 +06:30
Aung Myo
45c69ab536 update sale ability and shipt slae 2017-06-30 15:53:25 +06:30
Aung Myo
a5bf5222f6 update conflic file 2017-06-30 14:19:05 +06:30
Aung Myo
155e1a5ba3 hide shiftsale in header 2017-06-30 14:16:05 +06:30
Aung Myo
43b9bdc168 update shiftsale 2017-06-30 14:15:04 +06:30
Nweni
18094f5a71 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-30 13:44:45 +06:30
Nweni
2713fae6b5 Update 2017-06-30 13:44:29 +06:30
Yan
34166a1387 merge with origin master 2017-06-30 13:39:52 +06:30
Yan
cae7157d8b Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant 2017-06-30 13:34:30 +06:30
Aung Myo
1d08954a76 update shift sale 2017-06-30 13:32:56 +06:30
Yan
9c1a324eff add other charges 2017-06-30 13:29:55 +06:30
Nweni
77220ae65b Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-29 18:59:27 +06:30
Nweni
8046bc7745 shift 2017-06-29 18:59:17 +06:30
Aung Myo
3b9c16d8d5 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm 2017-06-29 15:42:45 +06:30
Aung Myo
9305e0c4b4 update authorize void and edit in cashier 2017-06-29 15:39:46 +06:30
Yan
fd857146e8 fix for shift sale query and prepare rounding adj 2017-06-29 15:20:40 +06:30
Aung Myo
f60c145c00 update queue 2017-06-29 14:33:05 +06:30
Yan
fbeab17b3c merge with origin master 2017-06-29 14:08:20 +06:30
Nweni
8d09e5a919 shift sale update 2017-06-29 13:48:14 +06:30
Yan
8ba2606f6e merge with crm 2017-06-29 13:40:30 +06:30
Nweni
e3c2f02c81 fixed conflict 2017-06-29 13:39:37 +06:30
Nweni
618a89472a shift open/close 2017-06-29 13:35:09 +06:30
Yan
8045bb31e9 merge with discount 2017-06-29 11:41:29 +06:30
Yan
9991970203 add first bill 2017-06-29 11:34:13 +06:30
Aung Myo
173d824c27 update card column in queue 2017-06-28 23:45:28 +06:30
Aung Myo
58e95e573e update numberformat in pdf 2017-06-28 23:13:20 +06:30
Yan
50091e4016 updated for api bill controller 2017-06-28 16:56:43 +06:30
Aung Myo
e9e184894d update fixed conflict 2017-06-28 16:44:31 +06:30
Yan
5ff75fad7d fix for undefied method type in item pdf 2017-06-28 15:40:54 +06:30
Nweni
f42c800ae1 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into payment 2017-06-28 15:34:14 +06:30
Nweni
6a3973beea fixed conflict 2017-06-28 15:33:27 +06:30
Nweni
986655052a shift 2017-06-28 15:29:44 +06:30
Yan
ea4ba325fa text change percentage value 2017-06-28 14:15:35 +06:30
Nweni
55278c83bc fixed conflict 2017-06-28 12:58:27 +06:30
Nweni
f01e1b1ce3 edit login 2017-06-28 12:57:39 +06:30
Aung Myo
ab7f08b1d6 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm 2017-06-28 12:47:18 +06:30
Min Zeya Phyo
5716294955 Merge branch 'master' of ssh://bitbucket.org/code2lab/sxrestaurant
* 'master' of ssh://bitbucket.org/code2lab/sxrestaurant:
  billed
  rake task
  Pending Payment
  Credit payment
  update page height bill pdf
  not show price 0 fixed
  multiple invoice void
  rake task fix
  Shop View
  Shop View
  get update
  not to show price 0 and 10
2017-06-28 12:45:05 +06:30