Commit Graph

77 Commits

Author SHA1 Message Date
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
74b0550c30 payment_setting 2017-06-08 17:57:29 +06:30
Moe Su
e2ecfaeaad For pull 2017-06-07 18:11:03 +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
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
db75780267 employee login and authentication with session 2017-04-14 22:47:44 +06:30
Min Zeya Phyo
0ddc7bdb44 basic layout template 2017-04-05 08:24:21 +06:30
Min Zeya Phyo
aba3e52d0b bootstrap basic layout 2017-04-04 02:29:11 +06:30
Min Zeya Phyo
a247cd44eb add zone test-rspec 2017-03-24 21:28:57 +06:30
Min Zeya Phyo
3efee9ed8c init project commit 2017-03-24 19:58:23 +06:30