Commit Graph

367 Commits

Author SHA1 Message Date
Myat Zin Wai Maw
d6e0079314 - 2020-01-14 18:09:45 +06:30
Myat Zin Wai Maw
60af9124bb fix 2020-01-14 13:31:54 +06:30
Zin Moe
a3edbb07fd replace @shop and shop_details with current_shop 2020-01-13 17:34:48 +06:30
Thein Lin Kyaw
d379c05298 edit for shop_code query 2020-01-13 15:28:26 +06:30
Myat Zin Wai Maw
d794e023b8 payment 2020-01-13 15:08:04 +06:30
yarzar_code
dff2c69627 Read NFC 2020-01-12 20:07:28 +06:30
NyanLinHtut
314cc507a3 merge with r-19 2020-01-11 11:08:33 +06:30
Myat Zin Wai Maw
45326750db search account no,security code check,find order,payment create 2020-01-11 10:37:09 +06:30
Myat Zin Wai Maw
d43266bd7d - 2020-01-08 15:35:47 +06:30
Myat Zin Wai Maw
ce419891dd menu item by id 2020-01-02 16:09:40 +06:30
Thein Lin Kyaw
d87ffee65b update seed generator and remove hard-coded customer id 2019-12-20 10:35:31 +06:30
Myat Zin Wai Maw
dc21b297b1 payment fail 2019-12-19 18:22:04 +06:30
Myat Zin Wai Maw
16485875c1 add to existing order 2019-12-18 10:15:24 +06:30
Myat Zin Wai Maw
8af99742a3 bill and tax 2019-12-17 15:06:37 +06:30
Myat Zin Wai Maw
4d0f13106d foodcourt 2019-12-17 13:49:15 +06:30
Myat Zin Wai Maw
ce79038668 shop 2019-12-13 10:40:36 +06:30
NyanLinHtut
afe3c995ae fixed conflit 2019-12-13 10:09:25 +06:30
NyanLinHtut
c6c605bb01 add out of stock 2019-12-13 10:07:20 +06:30
Thein Lin Kyaw
58117d0f48 update order and request bill 2019-12-11 17:56:39 +06:30
Myat Zin Wai Maw
79598c0126 shop code 2019-12-10 15:18:48 +06:30
Myat Zin Wai Maw
c606ca73db foodcourt 2019-12-10 13:37:06 +06:30
Myat Zin Wai Maw
5b3a62917d void 2019-12-09 17:27:38 +06:30
Thein Lin Kyaw
3a99e1bb09 update for order process
Add activereocrd-import gem for bulk insert
2019-12-09 10:33:19 +06:30
Thein Lin Kyaw
67e7658e56 Merge branch 'r-1902001-01-dev' of gitlab.com:code2lab/SXRestaurant into r-1902001-01-dev 2019-12-09 10:30:13 +06:30
Myat Zin Wai Maw
fabf3f613e app 2019-12-05 11:06:12 +06:30
Nweni
cab37a6bfb fixed conflict 2019-12-04 17:06:58 +06:30
Nweni
8db0496a96 printer 2019-12-04 17:04:41 +06:30
Thein Lin Kyaw
dc1f464b7f update api/resturant/menu 2019-12-04 15:49:03 +06:30
Myat Zin Wai Maw
7e7f8f173f app order 2019-12-04 14:37:21 +06:30
Nweni
8b5d28524e shop code 2019-12-04 13:57:26 +06:30
Myat Zin Wai Maw
0b98f3a149 Merge branch 'foodcourt' of gitlab.com:code2lab/SXRestaurant into foodcourt 2019-12-04 13:33:31 +06:30
Myat Zin Wai Maw
08f5689841 print 2019-12-04 13:33:13 +06:30
Nweni
7afddcdf2b shop code 2019-12-04 10:49:46 +06:30
Nweni
3b5b6c78f3 fixed conflict 2019-12-04 10:37:52 +06:30
Thein Lin Kyaw
37380f6bfb Fix json rendering error 2019-12-03 19:37:59 +06:30
Nweni
15361fe4e1 verfication controller 2019-12-03 18:22:38 +06:30
Nweni
bb698789e4 Merge branch 'foodcourt' of https://gitlab.com/code2lab/SXRestaurant into foodcourt 2019-12-03 17:50:53 +06:30
Nweni
3729c20d05 api_controller 2019-12-03 17:50:42 +06:30
Myat Zin Wai Maw
840f0f9c43 Merge branch 'foodcourt' of gitlab.com:code2lab/SXRestaurant into foodcourt 2019-12-03 17:49:21 +06:30
Myat Zin Wai Maw
fe56286c76 app order 2019-12-03 17:49:01 +06:30
Nweni
be8cf2c34e api controller 2019-12-03 16:46:52 +06:30
Nweni
78838a7718 current shop 2019-12-03 14:54:53 +06:30
Nweni
417d64ecae fixed conflict after merch dev for current shop 2019-12-02 19:30:24 +06:30
Thein Lin Kyaw
1607cb70d3 Single database for multiple shops
Use ActsAsTenant as Multi-tenancy for shops

See below files:
- app/controllers/concern/multi_tenancy.rb
- app/models/application_record.rb
- app/models/shop.rb

An initializer can be created to control option in ActsAsTenant.

config/initializers/acts_as_tenant.rb
require 'acts_as_tenant/sidekiq'

ActsAsTenant.configure do |config|
  config.require_tenant = false # true
end

more detail: https://github.com/ErwinM/acts_as_tenant
2019-12-02 18:02:39 +06:30
Nweni
de73bf9f7d fixed conflict 2019-12-02 17:43:02 +06:30
Thein Lin Kyaw
937f40e7c1 Single database for multiple shops
Use ActsAsTenant as Multi-tenancy for shops

See below files:
- app/controllers/concern/multi_tenancy.rb
- app/models/application_record.rb
- app/models/shop.rb

An initializer can be created to control option in ActsAsTenant.
config/initializers/acts_as_tenant.rb
require 'acts_as_tenant/sidekiq'
ActsAsTenant.configure do |config|
  config.require_tenant = false # true
end

more details: https://github.com/ErwinM/acts_as_tenant
2019-12-02 17:19:28 +06:30
Myat Zin Wai Maw
cac6994ccb separate foodcourt module 2019-12-02 16:10:51 +06:30
Nweni
3a85f1e319 current shop changes 2019-11-28 18:33:56 +06:30
Nweni
d41d957688 fixed conflict after merge with dev 2019-11-28 16:47:12 +06:30
Myat Zin Wai Maw
09e7650452 order from app 2019-11-28 15:52:50 +06:30