Commit Graph

397 Commits

Author SHA1 Message Date
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
Myat Zin Wai Maw
fe5dc6bb5a card payment 2019-11-27 15:05:42 +06:30
Nweni
845d6662c9 Verify 2019-11-27 09:36:30 +06:30
Nweni
6fbf30c950 fixed conflict 2019-11-25 09:26:21 +06:30
Myat Zin Wai Maw
d1ab2c194d shop code 2019-11-22 18:24:02 +06:30
Nweni
3b468b78f4 changes in verification 2019-11-22 18:03:41 +06:30
Nweni
fd57d89799 order 2019-11-19 18:15:25 +06:30
Nweni
aad153a4ef customer create 2019-11-19 09:16:55 +06:30
Nweni
54ab9e0ca5 shops 2019-11-18 12:22:31 +06:30
Nweni
3253518aae fixed conflict 2019-11-15 16:23:33 +06:30
NyanLinHtut
891995f531 Merge branch 'r-1902001-01-dev' of gitlab.com:code2lab/SXRestaurant into r-1902001-01-dev 2019-11-13 13:35:34 +06:30
NyanLinHtut
216dfe4f2f add loader service api 2019-11-13 13:34:11 +06:30
Thein Lin Kyaw
8046b7210b request bill error on promotion. fix for compute sale's totals on promotion. 2019-11-08 20:35:26 +06:30
Nweni
2b771a68de shop 2019-10-30 14:45:36 +06:30
Nweni
530b5ac87a cups gem 2019-10-30 09:56:37 +06:30
Thein Lin Kyaw
33670b450e prevent order append to previous sale 2019-10-07 10:43:43 +06:30
Thein Lin Kyaw
327a6e17bf fix first bill amount less than actual sales 2019-09-27 20:35:05 +06:30
Zoey
b7368314c5 print receipt bill 2019-07-03 13:49:54 +06:30
Zoey
79d8eb94ef kbzpay 2019-06-26 11:42:51 +06:30
Zoey
01fcb64da1 Merge branch 'r-1902001-01' of gitlab.com:code2lab/SXRestaurant into r-1902001-01-dev 2019-06-24 14:02:18 +06:30
Nweni
259ef75295 Merge branch 'r-1902001-01-dev' of https://gitlab.com/code2lab/SXRestaurant into r-1902001-01-dev 2019-06-24 10:10:25 +06:30