git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • fa901806d4 bugs fix for crm Yan 2017-08-01 11:50:41 +06:30
  • 4f84676547 updated osaka menu Yan 2017-07-31 20:57:42 +06:30
  • 599650eadf updated osaka menu Yan 2017-07-31 20:45:27 +06:30
  • 9f7472cd2d update osaka menu Yan 2017-07-31 20:41:47 +06:30
  • 86f1faea37 update rake menu Aung Myo 2017-07-31 20:40:45 +06:30
  • 1346053bd8 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into staging Aung Myo 2017-07-31 19:42:39 +06:30
  • efa0f4cbfb update conflict Aung Myo 2017-07-31 19:39:50 +06:30
  • 78d5150b35 merge with staging Yan 2017-07-31 19:37:51 +06:30
  • ac21e14062 update menu_osaka Yan 2017-07-31 19:30:26 +06:30
  • 2d6841a4c4 update Aung Myo 2017-07-31 18:33:47 +06:30
  • b3c77fc28c update lookup Aung Myo 2017-07-31 17:33:06 +06:30
  • a57831a3fc fix for member Yan 2017-07-31 15:49:36 +06:30
  • bc5a7d01f7 update sale payment for rebate deleting puts Yan 2017-07-31 14:35:02 +06:30
  • 60089a3879 Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant Yan 2017-07-31 13:15:23 +06:30
  • bca21a664e editing menu Yan 2017-07-31 13:14:48 +06:30
  • 24d6a530e7 update Aung Myo 2017-07-31 13:14:36 +06:30
  • df08569fac update rake file for membership data Aung Myo 2017-07-31 10:37:47 +06:30
  • 6ac35bb874 update receipt no twice and sale order double and report changes Aung Myo 2017-07-31 09:39:34 +06:30
  • 78d383f5ec update customer validation messages Aung Myo 2017-07-28 18:08:11 +06:30
  • 98c04f21d8 update report and view Aung Myo 2017-07-28 17:07:16 +06:30
  • 24fd399c17 update view Aung Myo 2017-07-28 11:30:35 +06:30
  • 1dbbbcea4e Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant Yan 2017-07-27 18:54:46 +06:30
  • bf3e30c70f control for member create and member discount Yan 2017-07-27 18:53:41 +06:30
  • 63cda9a076 update view files Aung Myo 2017-07-27 17:43:07 +06:30
  • 9b678b8523 update add order menu category api Aung Myo 2017-07-27 16:40:35 +06:30
  • be0af338a8 update add oresr Aung Myo 2017-07-27 15:13:13 +06:30
  • 382c4f7161 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into staging Aung Myo 2017-07-27 14:04:40 +06:30
  • 42a7d01e16 update header view Aung Myo 2017-07-27 12:08:35 +06:30
  • 0408c6d498 dump.rdb Yan 2017-07-26 18:44:30 +06:30
  • 124528c138 Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant Yan 2017-07-26 18:40:11 +06:30
  • ad2dfa2ee0 crm updated Yan 2017-07-26 18:39:46 +06:30
  • 92e73c54a3 update add order view Aung Myo 2017-07-26 18:26:55 +06:30
  • 7bfe8b1578 dump.rdb Yan 2017-07-26 18:02:30 +06:30
  • f7588bd8d9 update member for already register member Yan 2017-07-26 16:42:51 +06:30
  • 1de6cc906c update rounding adj for osaka Aung Myo 2017-07-26 16:35:34 +06:30
  • e693b60945 bind member for already register member Yan 2017-07-26 16:00:15 +06:30
  • 50a878349d update add order Aung Myo 2017-07-26 15:08:44 +06:30
  • 83b8d72632 update add order Aung Myo 2017-07-26 15:04:35 +06:30
  • c93b50d46a update conflict oragimi.scss Aung Myo 2017-07-26 10:04:49 +06:30
  • 54d1fa68e6 Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant Yan 2017-07-25 18:22:56 +06:30
  • 89c8b9a9cc fix for re-calc tax for gram sale Yan 2017-07-25 18:08:04 +06:30
  • 6189404afb update sale Aung Myo 2017-07-25 17:51:14 +06:30
  • 54faa6e84f update receipt bill for line Aung Myo 2017-07-25 17:21:52 +06:30
  • cbe6803cf9 update cancelall void and receipt,item report for today Aung Myo 2017-07-25 16:55:36 +06:30
  • 09193a532a fix sale edit cntr Yan 2017-07-25 16:30:52 +06:30
  • 6baf039e6d update back buttom Aung Myo 2017-07-25 13:58:38 +06:30
  • 22f3ee8f54 Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant Yan 2017-07-25 13:41:04 +06:30
  • 5365b863f7 update header oqs in dashboard Aung Myo 2017-07-25 13:37:31 +06:30
  • 994e80b89e fix order print format Yan 2017-07-25 12:56:11 +06:30
  • 3f0ecb5ac6 update home view card column Aung Myo 2017-07-25 12:21:05 +06:30
  • 00b164a001 Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant Yan 2017-07-25 10:50:37 +06:30
  • a135e22024 update wrong commercial tax and service tax and role features Aung Myo 2017-07-25 10:49:36 +06:30
  • d01ec184f5 edit merchant code for bitp Yan 2017-07-25 09:53:25 +06:30
  • b9129381c8 Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant Yan 2017-07-24 19:30:32 +06:30
  • 6e4228853a update comertial tax and service in sale model Aung Myo 2017-07-24 19:29:58 +06:30
  • b240bbe5fe Merge branch 'oqs' of bitbucket.org:code2lab/sxrestaurant Yan 2017-07-24 19:28:59 +06:30
  • 9c4e5bbdc8 update comertial tax and service in sale model Aung Myo 2017-07-24 19:25:31 +06:30
  • bf9b977cd0 membership update Yan 2017-07-24 19:24:43 +06:30
  • a7cbea5dbb update login To show dashboard screen with available features based on user type Aung Myo 2017-07-24 17:42:34 +06:30
  • 8db4a8cc05 Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant Yan 2017-07-21 18:15:39 +06:30
  • b8fc67745d fix discount and receipt bill Yan 2017-07-21 18:15:10 +06:30
  • 8852bc0449 update pay without existing invoice in salepayment.rb Aung Myo 2017-07-21 17:52:38 +06:30
  • c5dbbea76d update long bill Aung Myo 2017-07-21 17:07:31 +06:30
  • 2e8c866761 osaka menu update and void tax calc fix Yan 2017-07-21 14:56:40 +06:30
  • 13e274eefb Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant Yan 2017-07-21 10:53:16 +06:30
  • 409fd05da4 no show void item in discount Yan 2017-07-21 10:52:46 +06:30
  • a0edef735d update report detail ,close_cashire_pdf and view reports Aung Myo 2017-07-21 09:57:22 +06:30
  • 30e1854969 fix discount with selected Yan 2017-07-20 17:42:02 +06:30
  • e45bc7964c fix for oqs completed Yan 2017-07-20 15:58:31 +06:30
  • 3792133aad update shift update from void in sale Aung Myo 2017-07-20 10:29:20 +06:30
  • b37cef46bd Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant into osaka Yan 2017-07-18 18:07:26 +06:30
  • 1fa8520a5e change discount_type to campaign_type Yan 2017-07-18 18:06:59 +06:30
  • 0ce6bc733b update membership rebate for food and beverage Aung Myo 2017-07-18 18:05:27 +06:30
  • a5546920b6 nfc done Yan 2017-07-18 16:06:36 +06:30
  • c068d702b3 still nfc Yan 2017-07-18 11:52:49 +06:30
  • 33537cef60 17 update for bitp Yan 2017-07-17 16:55:18 +06:30
  • df06b81b28 Merge branch 'staging' Yan 2017-07-17 15:13:31 +06:30
  • 51c14f379b still nfc Yan 2017-07-17 15:07:27 +06:30
  • bd0b8681c9 update reports Aung Myo 2017-07-17 12:11:21 +06:30
  • 25ef380b4f finished report for all Aung Myo 2017-07-17 11:22:24 +06:30
  • b2ccc12e17 add paypar acc for nfc Yan 2017-07-16 18:16:52 +06:30
  • 0b7b5cae30 update osaka demo bugs Aung Myo 2017-07-14 17:23:40 +06:30
  • 7a036b8c0a fix for bill Yan 2017-07-13 11:34:57 +06:30
  • 6f57bb8a79 adding shift sale summary Yan 2017-07-13 11:12:02 +06:30
  • 6525834fa9 update add order view Aung Myo 2017-07-13 10:35:35 +06:30
  • 3232df44a6 update table no Yan 2017-07-13 09:56:10 +06:30
  • ef7cc1f6f0 Merge branch 'osaka' of bitbucket.org:code2lab/sxrestaurant into osaka Aung Myo 2017-07-12 19:48:51 +06:30
  • e34d267fc8 update control member for osaka Aung Myo 2017-07-12 19:43:56 +06:30
  • 9da05a72aa merge with master Yan 2017-07-12 17:58:07 +06:30
  • 6546b8020a Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into osaka Yan 2017-07-12 17:37:26 +06:30
  • 1a4ee24c44 Merge branch 'osaka' of bitbucket.org:code2lab/sxrestaurant into osaka Yan 2017-07-12 17:36:18 +06:30
  • da9bb9b519 added menu Yan 2017-07-12 17:33:14 +06:30
  • fc986bfed2 update show for discount Aung Myo 2017-07-12 17:23:20 +06:30
  • 1d873ddb68 update member discount and seed for detail Aung Myo 2017-07-12 17:05:10 +06:30
  • 762db6bff9 remove auto gen for menu Yan 2017-07-12 10:39:23 +06:30
  • c88248281c remove date filter in shift Yan 2017-07-12 10:27:45 +06:30
  • 465055aacb re-add validate for menu item and cat Yan 2017-07-12 10:20:43 +06:30
  • ac7b4dc56d dev dis Aung Myo 2017-07-12 10:19:02 +06:30
  • 1180a8e95d Merge branch 'osaka' of bitbucket.org:code2lab/sxrestaurant into discount Aung Myo 2017-07-12 10:14:39 +06:30
  • 32bc3c5229 update member discount Aung Myo 2017-07-12 10:13:19 +06:30