Commit Graph

60 Commits

Author SHA1 Message Date
Nweni
b0ad2049c5 dining_charges 2017-08-11 13:34:30 +06:30
Aung Myo
1d08954a76 update shift sale 2017-06-30 13:32:56 +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
ee651763b7 shift close and payment journal 2017-06-28 10:34:42 +06:30
Aung Myo
4c13be257b update authroize 2017-06-26 22:45:34 +06:30
Aung Myo
01e5b7ba6c update authorize 2017-06-23 09:41:48 +06:30
Aung Myo
e90178cfdc finished CRM and customer 2017-06-12 14:23:20 +06:30
Aung Myo
0943808ac8 finished order and sales in setting 2017-06-12 00:45:59 +06:30
Aung Myo
eb001275c7 fixed conflict 2017-06-11 18:09:00 +06:30
Moe Su
33cc576f1e edit membership setting , otherpayment page 2017-06-11 15:48:53 +06:30
Aung Myo
406172c6ff fixed conflict 2017-06-09 12:04:36 +06:30
Aung Myo
35277ac000 queue and crm view updated 2017-06-09 09:29:25 +06:30
Moe Su
7702c50675 Add membership action 2017-06-09 02:23:16 +06:30
Moe Su
74b0550c30 payment_setting 2017-06-08 17:57:29 +06:30
Moe Su
e2ecfaeaad For pull 2017-06-07 18:11:03 +06:30
Nweni
0cc378f318 fixed conflict 2017-06-06 09:43:16 +06:30
Nweni
faca7295f7 added new image upload file 2017-06-05 17:14:07 +06:30
Min Zeya Phyo
4fc511d531 custom primary key for transaction 2017-06-04 16:27:14 +06:30
Min Zeya Phyo
9dddd2fc78 Merge branch 'master' of ssh://bitbucket.org/code2lab/sxrestaurant 2017-06-03 15:05:25 +06:30
Min Zeya Phyo
bf8679c201 Merge branch 'shop_setup' 2017-06-03 14:26:45 +06:30
Yan
03ae60d2e6 merge all 03062017 2017-06-03 12:50:08 +06:30
Aung Myo
030d3ffb0f confict clear 2017-06-02 19:22:01 +06:30
Aung Myo
01fefe3b79 account working 2017-06-02 19:16:14 +06:30
Yan
ea082f0d43 creating order queue printer 2017-06-02 19:01:28 +06:30
Cherry
9afe39b7e2 commit for sales 2017-06-02 17:48:03 +06:30
Yan
6d705e2860 merge with master 2017-06-02 16:52:58 +06:30
Yan
022a2e005f initial print setup 2017-06-02 16:22:15 +06:30
Yan
7e46e3c634 Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant 2017-06-02 14:58:29 +06:30
Aung Myo
92a82f6e7f missing bookings controller adding 2017-06-02 14:52:14 +06:30
Yan
356923a9d8 pull master 2017-06-01 12:11:23 +06:30
Yan
82d7d7ffcc merge crm 2017-06-01 09:59:43 +06:30
Min Zeya Phyo
0189c01e04 Merge branch 'master' of ssh://bitbucket.org/code2lab/sxrestaurant 2017-05-31 23:50:06 +08:00
Yan
5a564abca9 oqs sample 2017-05-31 22:14:46 +06:30
Aung Myo
f036274f5e finished order tab view and customer tab 2017-05-31 18:19:51 +06:30
Yan
314372ef75 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into oqs 2017-05-31 13:52:51 +06:30
Nweni
7e7b89e143 added order_queue_item 2017-05-31 13:40:48 +06:30
Min Zeya Phyo
516b854fba shop_setup branch 2017-05-30 23:46:22 +08:00
Yan
e46fe1ec7c add cable but not complete 2017-05-30 19:02:40 +06:30
Min Zeya Phyo
9361e24a8a remove sale_discount from model list 2017-05-30 12:42:50 +06:30
Min Zeya Phyo
d7d29e4d16 sales listing under transacitons 2017-05-29 18:55:34 +06:30
Min Zeya Phyo
08f993d621 Order queue stations 2017-05-28 13:30:30 +06:30
Min Zeya Phyo
0af7d78c3c scaffold models 2017-04-20 17:01:14 +06:30
Min Zeya Phyo
0a97947259 api integrated 2017-04-19 19:39:58 +06:30
Min Zeya Phyo
a717791a7c settings controllers 2017-04-18 13:01:05 +06:30
Min Zeya Phyo
dbad900cd4 payment api 2017-04-18 11:01:10 +06:30
Min Zeya Phyo
6a84a34a9f sale receipt generation and bill api 2017-04-17 13:09:54 +06:30
Min Zeya Phyo
db75780267 employee login and authentication with session 2017-04-14 22:47:44 +06:30
Min Zeya Phyo
7cc2ac395d order queue processing 2017-04-14 15:50:17 +06:30
Min Zeya Phyo
5b1bb6f6cd sales and orders methods updates 2017-04-11 13:51:09 +08:00
Min Zeya Phyo
0ddc7bdb44 basic layout template 2017-04-05 08:24:21 +06:30