Commit Graph

  • 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
  • 71c3b2f451 update tether Aung Myo 2017-06-15 14:06:26 +06:30
  • a77065ac3d Merge branch 'crm' Aung Myo 2017-06-15 14:02:44 +06:30
  • f83d11e379 update customer Aung Myo 2017-06-15 14:02:09 +06:30
  • bd94e808d4 print format Yan 2017-06-15 13:24:37 +06:30
  • 5878999ead Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Aung Myo 2017-06-15 13:19:13 +06:30
  • ed3f97a2af upadte customer and sale void Aung Myo 2017-06-15 13:17:58 +06:30
  • 215239ec0f Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Phyo 2017-06-15 12:30:33 +06:30
  • 3eb1848fba Puma for production Phyo 2017-06-15 12:30:13 +06:30
  • 5675f0e48b Payment Bug fix Phyo 2017-06-15 12:29:36 +06:30
  • 5fa477fb17 after pull superuser 2017-06-15 11:54:45 +06:30
  • a4211166de before pull superuser 2017-06-15 11:53:27 +06:30
  • 4330bf9553 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Nweni 2017-06-15 11:52:01 +06:30
  • 5636b7a61a Update Nweni 2017-06-15 11:51:49 +06:30
  • 061c06b3c3 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Yan 2017-06-15 11:25:49 +06:30
  • cca890ffdd disable auto reload origami Yan 2017-06-15 11:25:13 +06:30
  • 41572d5360 add sale reason in seed Yan 2017-06-15 11:12:50 +06:30
  • 136ca65233 Back Button in Payment Phyo 2017-06-15 11:10:11 +06:30
  • 69320d0752 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Phyo 2017-06-15 11:06:32 +06:30
  • a600838c50 Bug Fix with Production Phyo 2017-06-15 11:05:13 +06:30
  • 2efd6fc410 merge with origin master Yan 2017-06-15 10:53:42 +06:30
  • e133595d49 authentication fixed Yan 2017-06-15 10:48:32 +06:30
  • 7dffd668ea Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm Aung Myo 2017-06-15 10:21:26 +06:30
  • 8cb40783a4 update requestby in sail Aung Myo 2017-06-15 10:20:26 +06:30
  • ed34088907 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Nweni 2017-06-15 10:10:19 +06:30
  • 5e8bc9c013 Update Nweni 2017-06-15 10:10:02 +06:30
  • 2a492345a4 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Phyo 2017-06-15 09:50:43 +06:30
  • c6f976bab3 Payment via card Bug fix Phyo 2017-06-15 09:49:44 +06:30
  • 29d5b134da fixed conflict Aung Myo 2017-06-15 09:46:01 +06:30
  • 237828af40 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant superuser 2017-06-15 09:43:35 +06:30
  • d608bd5c30 before pull superuser 2017-06-15 09:43:22 +06:30
  • b88c40be41 sale update Aung Myo 2017-06-15 09:41:00 +06:30
  • 8d557cf7eb remove put Nweni 2017-06-15 09:39:30 +06:30
  • 44bfc139c7 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant superuser 2017-06-15 09:37:10 +06:30
  • a1a6adbdd6 update Nweni 2017-06-15 01:49:51 +06:30
  • 34b1c26b0b update Nweni 2017-06-15 01:33:52 +06:30
  • 883653f8ee Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Nweni 2017-06-15 01:20:09 +06:30
  • 401bba7aed add set up menu Nweni 2017-06-15 01:19:50 +06:30
  • 580c87cd30 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant superuser 2017-06-14 20:13:48 +06:30
  • 541907d204 Merchant Id Phyo 2017-06-14 20:08:44 +06:30
  • 764855bea0 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Phyo 2017-06-14 20:08:02 +06:30
  • 5cfcc9ab6a fixed pagination Yan 2017-06-14 20:01:34 +06:30
  • 0eb8ac7087 fixing pagination Yan 2017-06-14 19:54:11 +06:30
  • 17c5a6cdf8 merge with master Yan 2017-06-14 19:43:05 +06:30
  • 8cfa2bc5c5 payment bill added and origami bug fixed Yan 2017-06-14 19:41:32 +06:30
  • fba0e97f76 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant superuser 2017-06-14 18:57:18 +06:30
  • bbe08585fc before pull superuser 2017-06-14 18:57:10 +06:30
  • 39e03fab25 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Nweni 2017-06-14 18:56:23 +06:30
  • 109d1b6435 update Nweni 2017-06-14 18:56:11 +06:30
  • dd9863025f prepare for payment bill Yan 2017-06-14 18:15:01 +06:30
  • 2da2edc5ec update sale and customer Aung Myo 2017-06-14 18:13:13 +06:30
  • d970cfc8bd Other Payments UI change Phyo 2017-06-14 17:58:38 +06:30
  • 91de9f2767 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Phyo 2017-06-14 17:14:03 +06:30
  • 3b99016f80 Limit paid amount for JCB, Visa and Master Card Phyo 2017-06-14 17:13:43 +06:30
  • ac7d99362d Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant Yan 2017-06-14 16:52:54 +06:30
  • 41e9aec389 add cashier in sale and origami ui updated Yan 2017-06-14 16:51:25 +06:30
  • 15c19e0cbb Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Nweni 2017-06-14 16:06:24 +06:30
  • f00bd9df37 update Nweni 2017-06-14 16:06:11 +06:30
  • 391b57ccd5 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Aung Myo 2017-06-14 15:59:52 +06:30
  • 1963acbec0 Merge branch 'crm' Aung Myo 2017-06-14 15:59:19 +06:30
  • 7d6414cce6 auto reload page for oqs 5sec and origami 10sec Yan 2017-06-14 15:59:08 +06:30
  • 914069e3af update customer and sale Aung Myo 2017-06-14 15:58:41 +06:30
  • c1e8f3ffb2 updated printer for each stations Yan 2017-06-14 15:30:28 +06:30
  • af623cb474 Instances Name Show Phyo 2017-06-14 15:01:36 +06:30
  • cd588d9b4f print setting ui updated Yan 2017-06-14 14:37:23 +06:30
  • ff65f4f480 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into staging Yan 2017-06-14 14:13:45 +06:30
  • 2d0d962677 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Phyo 2017-06-14 13:58:09 +06:30
  • f7451a4675 update Nweni 2017-06-14 13:33:09 +06:30
  • 5cff9c891b Other Payment shown by type Phyo 2017-06-14 12:02:52 +06:30
  • 1565b054df Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into staging Yan 2017-06-14 11:25:14 +06:30
  • 7d7ac9fe06 oqs print formatted Yan 2017-06-14 11:21:37 +06:30
  • 7b2d2731c1 auth Nweni 2017-06-14 11:05:15 +06:30
  • 7e35850c69 comment nokogiri gem Yan 2017-06-14 10:53:37 +06:30
  • d7fca79881 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Nweni 2017-06-14 10:49:19 +06:30
  • 9d1aff2fa2 other payment updated Nweni 2017-06-14 10:49:00 +06:30
  • 14e0d91a4e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Aung Myo 2017-06-14 10:45:36 +06:30
  • 4126012e6d Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Phyo 2017-06-14 10:44:00 +06:30
  • c155c86970 update checkbox in customer view Aung Myo 2017-06-14 10:43:27 +06:30
  • f0fe589ec6 Payment conflict in Del key Phyo 2017-06-14 10:43:19 +06:30
  • 3d2b9f745e payment Nweni 2017-06-14 10:41:26 +06:30
  • 74350e2b73 nokogiri gem re-add Yan 2017-06-14 10:38:57 +06:30
  • 998b23aae5 update key Nweni 2017-06-14 10:27:15 +06:30
  • 3cb5878293 update sale Aung Myo 2017-06-14 10:18:48 +06:30
  • b4021a87c8 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into pre_master Yan 2017-06-14 10:16:55 +06:30
  • b7f1a0a029 print format updating Yan 2017-06-14 10:15:35 +06:30
  • a16af5e404 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Nweni 2017-06-14 10:07:48 +06:30
  • 7d5d23e5a6 Update Nweni 2017-06-14 10:07:31 +06:30
  • 871c37f04e update search Aung Myo 2017-06-14 00:11:03 +06:30
  • 3db6252304 update search and crm Aung Myo 2017-06-14 00:09:54 +06:30
  • 713e0a367c Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm Aung Myo 2017-06-13 20:23:00 +06:30
  • e9d3ca3059 pull master for membership Aung Myo 2017-06-13 20:22:33 +06:30
  • 27971f406b Seed Moe Su 2017-06-13 20:22:28 +06:30
  • 7057e320cf Merge branch 'crm' Aung Myo 2017-06-13 20:13:01 +06:30
  • b86ae8d32d customer search Aung Myo 2017-06-13 20:11:24 +06:30
  • 2e316f46fe seed updated Nweni 2017-06-13 19:58:15 +06:30
  • d1d8226528 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Nweni 2017-06-13 19:49:35 +06:30
  • 71f88f8a5d Update Nweni 2017-06-13 19:49:25 +06:30
  • 57f7f1037d Change Amount Bug Fix Phyo 2017-06-13 19:41:51 +06:30
  • db2cce3dfa Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant Nweni 2017-06-13 19:06:59 +06:30