Commit Graph

111 Commits

Author SHA1 Message Date
yamin
1aea52619a UI change 2017-10-23 11:38:10 +06:30
Yan
d487601802 add aes crypt gem 2017-10-10 11:06:22 +06:30
Zin Lin Phyo
df4caa288d jquery date-time picker 2017-08-30 10:46:46 +06:30
Zin Lin Phyo
5fcfbdc020 fix conflit 2017-08-29 18:42:08 +06:30
Zin Lin Phyo
f03d8654e7 commission report 2017-08-29 18:36:46 +06:30
yamin
e84c080552 DataetimepickerInJuty 2017-08-29 13:20:32 +06:30
Zin Lin Phyo
1cbea173df product commission transaction in commissioner 2017-08-28 18:17:22 +06:30
Phyo
857fcd419f Promotion Time Fixed 2017-08-23 19:09:44 +06:30
Phyo
e3c1dd216a Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring 2017-08-21 17:40:44 +06:30
Phyo
e9ba56826c Promotion Product Add 2017-08-21 17:38:07 +06:30
Yan
f018a56027 add CarrierWave gems for menu image upload 2017-08-14 18:53:39 +06:30
Yan
bf9b977cd0 membership update 2017-07-24 19:24:43 +06:30
Aung Myo
78adf564e1 crong job and close cashier 2017-07-02 09:37:19 +06:30
Nweni
45961880c8 fixed conflict 2017-06-28 15:35:05 +06:30
Nweni
089848ed4a credit note payment 2017-06-26 17:49:55 +06:30
Yan
d3dc2e2dd8 remove pg in gem 2017-06-26 16:39:55 +06:30
Nweni
3b71cb1d30 uncomment pg @ gem 2017-06-26 13:52:43 +06:30
Yan
1f6a0eb1f6 fix with merge 2017-06-23 19:20:00 +06:30
Nweni
81c50f220a edit invoice 2017-06-23 17:37:08 +06:30
Yan
a90bbbebec merge with origin master 2017-06-22 18:06:56 +06:30
Nweni
0c0e44c808 move table 2017-06-22 16:31:41 +06:30
Yan
bded56a696 customer seed updated 2017-06-22 10:11:50 +06:30
Aung Myo
4ab5c311eb update crm 2017-06-21 10:05:07 +06:30
Yan
5cfcc9ab6a fixed pagination 2017-06-14 20:01:34 +06:30
Yan
0eb8ac7087 fixing pagination 2017-06-14 19:54:11 +06:30
Yan
ff65f4f480 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into staging 2017-06-14 14:13:45 +06:30
Nweni
f7451a4675 update 2017-06-14 13:33:09 +06:30
Yan
7e35850c69 comment nokogiri gem 2017-06-14 10:53:37 +06:30
Yan
74350e2b73 nokogiri gem re-add 2017-06-14 10:38:57 +06:30
Aung Myo
b513aa22ab datepicker 2017-06-13 12:27:45 +06:30
Aung Myo
f8df5147a4 fixed conflict file 2017-06-13 10:40:49 +06:30
Aung Myo
c05a64bae7 update customer amount 2017-06-13 10:36:40 +06:30
Nweni
3bc3419243 fixed conflict 2017-06-12 18:52:12 +06:30
Nweni
6945449523 get update 2017-06-12 18:51:02 +06:30
Cherry
a247c142b8 ReceiptList Report Rough 2017-06-12 18:26:00 +06:30
Moe Su
b47c983886 Edit Redim 2017-06-12 18:18:24 +06:30
Aung Myo
406172c6ff fixed conflict 2017-06-09 12:04:36 +06:30
Nweni
35553217f5 fixed conflict 2017-06-09 10:58:40 +06:30
Nweni
56a6d84abe Update 2017-06-09 10:57:16 +06:30
Aung Myo
35277ac000 queue and crm view updated 2017-06-09 09:29:25 +06:30
Moe Su
5f5e6470c7 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into loyalty 2017-06-09 02:40:48 +06:30
Moe Su
7702c50675 Add membership action 2017-06-09 02:23:16 +06:30
Yan
42a29296c7 update gem 2017-06-08 19:07:20 +06:30
Yan
43debf4b7e merged with crm 2017-06-08 19:04:48 +06:30
Yan
5c5c0dba33 update gem 2017-06-08 18:08:34 +06:30
Yan
fbc00bc3e4 merged loyalty 2017-06-08 15:28:09 +06:30
Moe Su
664fe2f6e1 Adding Redeem at payment 2017-06-08 15:17:26 +06:30
Aung Myo
8388192a81 delete view origami file 2017-06-08 14:46:35 +06:30
Yan
c7aac7c2b8 update gem 2017-06-08 10:51:30 +06:30
Yan
612f037fe8 index ui for discount 2017-06-08 10:40:06 +06:30