Commit Graph

  • 675d83c80f sale item report and rebate balance Aung Myo 2017-06-19 11:54:34 +06:30
  • 566cc2f3c1 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Yan 2017-06-19 11:28:19 +06:30
  • b747845cbf merge with settings_backend Yan 2017-06-19 11:15:28 +06:30
  • cf5854c2bb Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant Yan 2017-06-19 11:06:39 +06:30
  • f8dd7d9400 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Nweni 2017-06-19 09:47:04 +06:30
  • e25ef17308 payment Nweni 2017-06-19 09:46:51 +06:30
  • faa6beb243 update sale report Aung Myo 2017-06-18 20:23:39 +06:30
  • 6ffa73fa6f Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm Aung Myo 2017-06-18 20:18:12 +06:30
  • b65d127fd0 bill print format and tax fix Yan 2017-06-18 20:07:28 +06:30
  • 7881ae4dfa daily sale report Aung Myo 2017-06-18 16:38:46 +06:30
  • a204afda6a Discount added in Rebate Phyo 2017-06-18 13:19:07 +06:30
  • 5906dde741 uncomment for sale taxes Yan 2017-06-18 13:18:53 +06:30
  • 3a1fba2c6f Other Payments Bug fix Phyo 2017-06-18 13:18:23 +06:30
  • 6d0cfd17ac merge with origin master Yan 2017-06-18 12:50:07 +06:30
  • 0e7042f00f merge with settings_backend Yan 2017-06-18 12:30:06 +06:30
  • 74c6f3cebc Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant into staging Yan 2017-06-18 12:10:30 +06:30
  • e6cef8ef93 Redeem amount not cut bug Fix Phyo 2017-06-18 11:57:14 +06:30
  • f33f11df64 rescue member call and update oqs and js route bug Yan 2017-06-18 03:20:19 +06:30
  • 80320b6d3e oqs updated Yan 2017-06-18 00:45:39 +06:30
  • b62d5349c6 assign queue and other bug Aung Myo 2017-06-18 00:03:09 +06:30
  • b093a993ba Zone and OQS Phyo 2017-06-17 18:00:59 +06:30
  • e55ab32fad Update Nweni 2017-06-17 16:00:56 +06:30
  • 420e1b9cbc all info details in oqs Yan 2017-06-17 14:15:08 +06:30
  • b2ed77947e Update Nweni 2017-06-17 13:32:16 +06:30
  • 064f132906 Update Nweni 2017-06-17 12:13:38 +06:30
  • 1d2fb7b6ab dump.rdb Yan 2017-06-17 12:13:01 +06:30
  • 1b7f90ccfe Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Nweni 2017-06-17 11:35:26 +06:30
  • 29b76adba7 Update Nweni 2017-06-17 11:35:17 +06:30
  • 9d57bd31dc Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant superuser 2017-06-16 21:09:12 +06:30
  • 2cf9c6947c print for oqs Yan 2017-06-16 21:06:33 +06:30
  • d4c087990b Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant superuser 2017-06-16 19:56:56 +06:30
  • cd6ec67b94 Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant Yan 2017-06-16 19:28:37 +06:30
  • 885662fbe6 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Yan 2017-06-16 19:28:07 +06:30
  • 9f3acad10d update order for oqs Yan 2017-06-16 19:26:21 +06:30
  • c7efcb85d3 update sale Aung Myo 2017-06-16 19:19:33 +06:30
  • b029cabeba update show detail and order Aung Myo 2017-06-16 19:04:25 +06:30
  • 0a496f2274 update order for oqs Yan 2017-06-16 18:55:14 +06:30
  • 741a7d0d64 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into staging Yan 2017-06-16 18:23:12 +06:30
  • 841f74b406 update footer in req bill Yan 2017-06-16 18:22:18 +06:30
  • 49768900a9 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Nweni 2017-06-16 18:22:13 +06:30
  • 9ff5122b72 Update Nweni 2017-06-16 18:21:57 +06:30
  • cb43afc405 update bug sale Aung Myo 2017-06-16 18:04:39 +06:30
  • 38ae8f8f86 Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant into staging Yan 2017-06-16 13:45:23 +06:30
  • c40a2c78e7 oqs autoprint developing Yan 2017-06-16 13:44:39 +06:30
  • cd804a3d18 update queue no print Aung Myo 2017-06-16 13:28:28 +06:30
  • bec59a1d7b update queue no print Aung Myo 2017-06-16 13:23:05 +06:30
  • 58bc13e8b6 add auto_print field to migration Yan 2017-06-16 11:14:47 +06:30
  • 4cf9ce79ec update receipt print member info Aung Myo 2017-06-16 10:51:50 +06:30
  • 0e21117f05 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Aung Myo 2017-06-16 10:22:21 +06:30
  • f06235c2cf Merge branch 'crm' Aung Myo 2017-06-16 10:21:56 +06:30
  • 09a96372c8 update void and complete sale Aung Myo 2017-06-16 10:20:20 +06:30
  • 6675e0f81c Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant superuser 2017-06-16 10:06:02 +06:30
  • 87c3546974 merge with master Yan 2017-06-16 09:59:35 +06:30
  • 15682a3d49 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Yan 2017-06-16 09:57:34 +06:30
  • 73cf45a9c7 dump.rdb Yan 2017-06-16 09:54:47 +06:30
  • 2fe8f77bac Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant superuser 2017-06-16 09:43:05 +06:30
  • d92a0b0378 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Nweni 2017-06-16 09:27:50 +06:30
  • 998ec1bd01 update api Nweni 2017-06-16 09:27:39 +06:30
  • 0e820f0ee1 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Yan 2017-06-15 19:14:34 +06:30
  • 79496458e7 dump.rdb Yan 2017-06-15 19:13:48 +06:30
  • 14e3ee93b5 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Nweni 2017-06-15 19:13:15 +06:30
  • b9e1a0694c update api Nweni 2017-06-15 19:13:01 +06:30
  • f0ea6f3c56 finish reprint Aung Myo 2017-06-15 19:07:33 +06:30
  • c54c610b7f Rake bug fix Phyo 2017-06-15 18:36:36 +06:30
  • 5eafe7094a Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant Yan 2017-06-15 18:35:00 +06:30
  • 5cb2ec4a0d always modified dump.rdb Yan 2017-06-15 18:34:34 +06:30
  • 032bff5bb6 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Phyo 2017-06-15 18:27:16 +06:30
  • 8fb2dbf0d9 rake fix Phyo 2017-06-15 18:27:09 +06:30
  • b5743eb7a7 update customer bolder Aung Myo 2017-06-15 18:18:35 +06:30
  • a290e795ae dump.rdb in ignore Yan 2017-06-15 17:59:02 +06:30
  • 03feae5b0f fix get_order_items_details method in order_item and add taxes in receipt Yan 2017-06-15 17:57:58 +06:30
  • 744e937f3d update sale detail Aung Myo 2017-06-15 17:19:28 +06:30
  • 4098c99509 update membership in sale detail Aung Myo 2017-06-15 17:13:11 +06:30
  • e085adab74 add dump.rdb in ignore Yan 2017-06-15 16:51:12 +06:30
  • ffafec0105 Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant Yan 2017-06-15 16:47:25 +06:30
  • 77049176f6 oqs and zone for seed Yan 2017-06-15 16:47:04 +06:30
  • f0d3f30d88 update order queue , sale void Aung Myo 2017-06-15 16:24:00 +06:30
  • 9a93f2e622 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant superuser 2017-06-15 15:06:54 +06:30
  • d8a5c2043f before pull superuser 2017-06-15 15:06:44 +06:30
  • 0f41035b68 add dump.rdb to gitignore Yan 2017-06-15 15:04:49 +06:30
  • 6cd42a43af api order fixed Yan 2017-06-15 14:57:14 +06:30
  • 2484378de9 booking order for api fixed Yan 2017-06-15 14:55:33 +06:30
  • 739e7bc4dc udpate Nweni 2017-06-15 14:53:56 +06:30
  • 11b948e6c4 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Nweni 2017-06-15 14:53:02 +06:30
  • 0bdecb737c udpate Nweni 2017-06-15 14:52:52 +06:30
  • 5040404725 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Yan 2017-06-15 14:52:50 +06:30
  • 18e855f5f9 new order for booking fixed Yan 2017-06-15 14:52:23 +06:30
  • 8cab49e964 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Phyo 2017-06-15 14:44:41 +06:30
  • 0778df4e80 order fix for booking Yan 2017-06-15 14:44:27 +06:30
  • c30a3a1ea9 Nett Bug Fix Phyo 2017-06-15 14:44:25 +06:30
  • 344d27f034 always update dump.rdb Yan 2017-06-15 14:21:50 +06:30
  • a48ff7745d update customer Aung Myo 2017-06-15 14:21:20 +06:30
  • fec8c43dae Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant superuser 2017-06-15 14:19:55 +06:30
  • addf3603ff update customer Aung Myo 2017-06-15 14:19:31 +06:30
  • 5d63eb359e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Aung Myo 2017-06-15 14:14:08 +06:30
  • 441bd847ec update customer Aung Myo 2017-06-15 14:13:40 +06:30
  • 78bad72ced Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant superuser 2017-06-15 14:08:01 +06:30
  • 35048af451 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Phyo 2017-06-15 14:07:57 +06:30
  • 37dd8c9e5a before pull superuser 2017-06-15 14:07:54 +06:30
  • aa4391af7d Request bill from mobile Phyo 2017-06-15 14:07:43 +06:30