Commit Graph

1153 Commits

Author SHA1 Message Date
Yan
ae5299bbe1 dump 2017-08-02 17:32:23 +06:30
Yan
266f60d2cb dump 2017-08-02 15:15:05 +06:30
Yan
c096e82148 update shop in seed for osaka 2017-08-02 14:33:03 +06:30
Yan
da5dfa1853 void sale report update 2017-08-02 12:19:18 +06:30
Yan
a02af9256f Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant 2017-08-02 12:14:52 +06:30
Aung Myo
b0886b685c update clone 2017-08-02 12:14:03 +06:30
Yan
23faf65af6 add shift id after req bill 2017-08-01 18:41:53 +06:30
Yan
57108598b8 Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant 2017-08-01 16:34:49 +06:30
Aung Myo
8794352ed5 update rake file 2017-08-01 16:33:41 +06:30
Yan
20f344ce89 filter with today in oqs 2017-08-01 16:33:36 +06:30
Aung Myo
4704632546 update rake menu file 2017-08-01 15:18:44 +06:30
Yan
1220bbe55a Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant 2017-08-01 12:08:06 +06:30
Yan
632a8d624b update menu osaka 2017-08-01 12:07:45 +06:30
Aung Myo
8762783484 update customer and receipt old balance 2017-08-01 12:02:28 +06:30
Yan
fa901806d4 bugs fix for crm 2017-08-01 11:50:41 +06:30
Yan
4f84676547 updated osaka menu 2017-07-31 20:57:42 +06:30
Yan
599650eadf updated osaka menu 2017-07-31 20:45:27 +06:30
Yan
9f7472cd2d update osaka menu 2017-07-31 20:41:47 +06:30
Aung Myo
86f1faea37 update rake menu 2017-07-31 20:40:45 +06:30
Aung Myo
1346053bd8 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into staging 2017-07-31 19:42:39 +06:30
Aung Myo
efa0f4cbfb update conflict 2017-07-31 19:39:50 +06:30
Yan
78d5150b35 merge with staging 2017-07-31 19:37:51 +06:30
Yan
ac21e14062 update menu_osaka 2017-07-31 19:30:26 +06:30
Aung Myo
2d6841a4c4 update 2017-07-31 18:33:47 +06:30
Aung Myo
b3c77fc28c update lookup 2017-07-31 17:33:06 +06:30
Yan
a57831a3fc fix for member 2017-07-31 15:49:36 +06:30
Yan
bc5a7d01f7 update sale payment for rebate deleting puts 2017-07-31 14:35:02 +06:30
Yan
60089a3879 Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant 2017-07-31 13:15:23 +06:30
Yan
bca21a664e editing menu 2017-07-31 13:14:48 +06:30
Aung Myo
24d6a530e7 update 2017-07-31 13:14:36 +06:30
Aung Myo
df08569fac update rake file for membership data 2017-07-31 10:37:47 +06:30
Aung Myo
6ac35bb874 update receipt no twice and sale order double and report changes 2017-07-31 09:39:34 +06:30
Aung Myo
78d383f5ec update customer validation messages 2017-07-28 18:08:11 +06:30
Aung Myo
98c04f21d8 update report and view 2017-07-28 17:07:16 +06:30
Aung Myo
24fd399c17 update view 2017-07-28 11:30:35 +06:30
Yan
1dbbbcea4e Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant 2017-07-27 18:54:46 +06:30
Yan
bf3e30c70f control for member create and member discount 2017-07-27 18:53:41 +06:30
Aung Myo
63cda9a076 update view files 2017-07-27 17:43:07 +06:30
Aung Myo
382c4f7161 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into staging 2017-07-27 14:04:40 +06:30
Aung Myo
42a7d01e16 update header view 2017-07-27 12:08:35 +06:30
Yan
0408c6d498 dump.rdb 2017-07-26 18:44:30 +06:30
Yan
124528c138 Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant 2017-07-26 18:40:11 +06:30
Yan
ad2dfa2ee0 crm updated 2017-07-26 18:39:46 +06:30
Yan
7bfe8b1578 dump.rdb 2017-07-26 18:02:30 +06:30
Yan
f7588bd8d9 update member for already register member 2017-07-26 16:42:51 +06:30
Aung Myo
1de6cc906c update rounding adj for osaka 2017-07-26 16:35:34 +06:30
Yan
e693b60945 bind member for already register member 2017-07-26 16:00:15 +06:30
Yan
54d1fa68e6 Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant 2017-07-25 18:22:56 +06:30
Yan
89c8b9a9cc fix for re-calc tax for gram sale 2017-07-25 18:08:04 +06:30
Aung Myo
6189404afb update sale 2017-07-25 17:51:14 +06:30