From 0df7357cc973d9a58205f85cba0e6ff7f0c29c69 Mon Sep 17 00:00:00 2001 From: Thein Lin Kyaw Date: Fri, 17 Jan 2020 15:53:34 +0630 Subject: [PATCH] update rake to shop_create --- app/controllers/concerns/multi_tenancy.rb | 5 +- config/initializers/action_controller.rb | 5 +- ...d_is_out_of_stock_to_menu_item_instaces.rb | 10 +- .../20200112075013_add_remove_indexs.rb | 118 +++++++++--------- .../{add_shopcode.rake => shop_create.rake} | 11 +- 5 files changed, 80 insertions(+), 69 deletions(-) rename lib/tasks/{add_shopcode.rake => shop_create.rake} (95%) diff --git a/app/controllers/concerns/multi_tenancy.rb b/app/controllers/concerns/multi_tenancy.rb index 7fa85117..b7579fe0 100644 --- a/app/controllers/concerns/multi_tenancy.rb +++ b/app/controllers/concerns/multi_tenancy.rb @@ -21,7 +21,10 @@ module MultiTenancy end def not_found - head :not_found + respond_to do |format| + format.html { render :file => "#{Rails.root}/public/404", :layout => false, :status => :not_found } + format.json { head :not_found } + end end def current_shop diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb index d560c347..e88e2d7d 100644 --- a/config/initializers/action_controller.rb +++ b/config/initializers/action_controller.rb @@ -31,7 +31,10 @@ class ActionController::Base end def render_not_found - render :file => "#{Rails.root}/public/404", :layout => false, :status => :not_found + respond_to do |format| + format.html { render :file => "#{Rails.root}/public/404", :layout => false, :status => :not_found } + format.json { head :not_found } + end end def current_license(url) diff --git a/db/migrate/20191129043601_add_is_out_of_stock_to_menu_item_instaces.rb b/db/migrate/20191129043601_add_is_out_of_stock_to_menu_item_instaces.rb index c99cb0d0..824c0f24 100644 --- a/db/migrate/20191129043601_add_is_out_of_stock_to_menu_item_instaces.rb +++ b/db/migrate/20191129043601_add_is_out_of_stock_to_menu_item_instaces.rb @@ -1,5 +1,5 @@ -# class AddIsOutOfStockToMenuItemInstaces < ActiveRecord::Migration[5.1] -# def change -# add_column :menu_item_instances, :is_out_of_stock, :boolean, :default => 0 -# end -# end +class AddIsOutOfStockToMenuItemInstaces < ActiveRecord::Migration[5.1] + def change + add_column :menu_item_instances, :is_out_of_stock, :boolean, :default => 0 + end +end diff --git a/db/migrate/20200112075013_add_remove_indexs.rb b/db/migrate/20200112075013_add_remove_indexs.rb index d8889afe..aaa51a18 100644 --- a/db/migrate/20200112075013_add_remove_indexs.rb +++ b/db/migrate/20200112075013_add_remove_indexs.rb @@ -1,103 +1,103 @@ class AddRemoveIndexs < ActiveRecord::Migration[5.1] def change - remove_index "menu_items", name: "index_item_code" + # remove_index "menu_items", name: "index_item_code" add_index :menu_items, [:shop_code, :item_code] - remove_index "orders", name: "index_source" - remove_index "orders", name: "index_date" - remove_index "orders", name: "index_status" + # remove_index "orders", name: "index_source" + # remove_index "orders", name: "index_date" + # remove_index "orders", name: "index_status" add_index :orders, [:shop_code, :status] add_index :orders, [:shop_code, :source] add_index :orders, [:shop_code, :date] add_index :orders, [:shop_code, :source, :status, :date], name: "index_orders_on_source_status" - remove_index "order_items", name: "index_order_id" + # remove_index "order_items", name: "index_order_id" - remove_index "dining_facilities", name: "index_status" - remove_index "dining_facilities", name: "index_type" - remove_index "dining_facilities", name: "index_is_active" - remove_index "dining_facilities", name: "index_status_type_is_active" + # remove_index "dining_facilities", name: "index_status" + # remove_index "dining_facilities", name: "index_type" + # remove_index "dining_facilities", name: "index_is_active" + # remove_index "dining_facilities", name: "index_status_type_is_active" add_index :dining_facilities, [:shop_code, :is_active] add_index :dining_facilities, [:shop_code, :status] add_index :dining_facilities, [:shop_code, :type] add_index :dining_facilities, [:shop_code, :is_active, :status], name: 'index_dining_facilities_on_active_status' - remove_index "sale_items", name: "index_sale_items" - remove_index "sale_items", name: "index_sale_id" - remove_index "sale_items", name: "index_account_id" - remove_index "sale_items", name: "index_status" - remove_index "sale_items", name: "index_remark" - remove_index "sale_items", name: "index_qty" - remove_index "sale_items", name: "index_unit_ptice" - remove_index "sale_items", name: "index_taxable_price" - remove_index "sale_items", name: "index_ptice" - remove_index "sale_items", name: "index_is_taxable" + # remove_index "sale_items", name: "index_sale_items" + # remove_index "sale_items", name: "index_sale_id" + # remove_index "sale_items", name: "index_account_id" + # remove_index "sale_items", name: "index_status" + # remove_index "sale_items", name: "index_remark" + # remove_index "sale_items", name: "index_qty" + # remove_index "sale_items", name: "index_unit_ptice" + # remove_index "sale_items", name: "index_taxable_price" + # remove_index "sale_items", name: "index_ptice" + # remove_index "sale_items", name: "index_is_taxable" add_index :sale_items, [:shop_code, :status] - remove_index "sale_taxes", name: "index_sale_id" + # remove_index "sale_taxes", name: "index_sale_id" - remove_index "sale_payments", name: "index_sale_id" - remove_index "sale_payments", name: "index_payment_method" - remove_index "sale_payments", name: "index_sale_id_payment_method" + # remove_index "sale_payments", name: "index_sale_id" + # remove_index "sale_payments", name: "index_payment_method" + # remove_index "sale_payments", name: "index_sale_id_payment_method" add_index :sale_payments, [:shop_code, :payment_method] - remove_index "sale_orders", name: "index_sale_id" - remove_index "sale_orders", name: "index_order_id" + # remove_index "sale_orders", name: "index_sale_id" + # remove_index "sale_orders", name: "index_order_id" - remove_index "sale_audits", name: "index_sale_audits" + # remove_index "sale_audits", name: "index_sale_audits" - remove_index "lookups", name: "index_lookup_type" + # remove_index "lookups", name: "index_lookup_type" add_index :lookups, [:shop_code, :lookup_type] - remove_index "bookings", name: "index_bookings" - remove_index "bookings", name: "index_checkin_at" - remove_index "bookings", name: "index_checkout_by" - remove_index "bookings", name: "index_reserved_by" - remove_index "bookings", name: "index_booking_status" + # remove_index "bookings", name: "index_bookings" + # remove_index "bookings", name: "index_checkin_at" + # remove_index "bookings", name: "index_checkout_by" + # remove_index "bookings", name: "index_reserved_by" + # remove_index "bookings", name: "index_booking_status" add_index :bookings, [:shop_code, :booking_status] - remove_index "seed_generators", name: "index_seed_model" + # remove_index "seed_generators", name: "index_seed_model" add_index :seed_generators, [:shop_code, :model] - remove_index "assigned_order_items", name: "index_assigned_order_items" - remove_index "assigned_order_items", name: "index_item_code" - remove_index "assigned_order_items", name: "index_instance_code" - remove_index "assigned_order_items", name: "index_order_queue_station_id" - remove_index "assigned_order_items", name: "index_delivery_status" - remove_index "assigned_order_items", name: "index_created_at" + # remove_index "assigned_order_items", name: "index_assigned_order_items" + # remove_index "assigned_order_items", name: "index_item_code" + # remove_index "assigned_order_items", name: "index_instance_code" + # remove_index "assigned_order_items", name: "index_order_queue_station_id" + # remove_index "assigned_order_items", name: "index_delivery_status" + # remove_index "assigned_order_items", name: "index_created_at" add_index :assigned_order_items, [:shop_code, :item_code] add_index :assigned_order_items, [:shop_code, :instance_code] - add_index :assigned_order_items, [:shop_code, :item_code, :instance_code],name:'index_assigned_items_on_codes' + add_index :assigned_order_items, [:shop_code, :item_code, :instance_code], name: 'index_assigned_items_on_codes' - remove_index "booking_orders", name: "index_booking_id" - remove_index "booking_orders", name: "index_order_id" + # remove_index "booking_orders", name: "index_booking_id" + # remove_index "booking_orders", name: "index_order_id" - remove_index "customers", name: "index_membership_id" - remove_index "customers", name: "index_customer_type" + # remove_index "customers", name: "index_membership_id" + # remove_index "customers", name: "index_customer_type" add_index :customers, [:shop_code, :customer_type] - remove_index "shift_sales", name: "index_shift_started_at" - remove_index "shift_sales", name: "index_shift_closed_at" - remove_index "shift_sales", name: "index_shift_started_at_closed_at" - add_index :shift_sales, [:shop_code, :shift_started_at, :shift_closed_at],name:'index_shifts_on_time' + # remove_index "shift_sales", name: "index_shift_started_at" + # remove_index "shift_sales", name: "index_shift_closed_at" + # remove_index "shift_sales", name: "index_shift_started_at_closed_at" + add_index :shift_sales, [:shop_code, :shift_started_at, :shift_closed_at], name: 'index_shifts_on_time' - remove_index "print_settings", name: "index_unique_code" + # remove_index "print_settings", name: "index_unique_code" add_index :print_settings, [:shop_code, :unique_code] - remove_index "sales", name: "index_sales" - remove_index "sales", name: "index_receipt_date" - remove_index "sales", name: "index_payment_status" - remove_index "sales", name: "index_sale_status" - remove_index "sales", name: "index_sale_shift_sale_id" + # remove_index "sales", name: "index_sales" + # remove_index "sales", name: "index_receipt_date" + # remove_index "sales", name: "index_payment_status" + # remove_index "sales", name: "index_sale_status" + # remove_index "sales", name: "index_sale_shift_sale_id" add_index :sales, [:shop_code, :sale_status] add_index :sales, [:shop_code, :payment_status] add_index :sales, [:shop_code, :sale_status, :payment_status] - remove_index "promotions", name: "index_promotions" - remove_index "promotions", name: "index_promo_start_date" - remove_index "promotions", name: "index_promo_end_date" - remove_index "promotions", name: "index_promo_start_hour" - remove_index "promotions", name: "index_promo_end_hour" + # remove_index "promotions", name: "index_promotions" + # remove_index "promotions", name: "index_promo_start_date" + # remove_index "promotions", name: "index_promo_end_date" + # remove_index "promotions", name: "index_promo_start_hour" + # remove_index "promotions", name: "index_promo_end_hour" add_index :promotions, [:shop_code, :promo_start_date, :promo_end_date, :promo_start_hour, :promo_end_hour], name: 'index_promotions_on_time' end end diff --git a/lib/tasks/add_shopcode.rake b/lib/tasks/shop_create.rake similarity index 95% rename from lib/tasks/add_shopcode.rake rename to lib/tasks/shop_create.rake index db1b6047..f872db36 100644 --- a/lib/tasks/add_shopcode.rake +++ b/lib/tasks/shop_create.rake @@ -1,6 +1,11 @@ -namespace :manual_data do - desc "Add Manual Data" - task :add, [:shop_code] => :environment do |t, args| +namespace :shop do + desc "Create shop and seed data" + task :create, [:name, :shop_code, :client_name, :client_code, :address, :phone_no] => :environment do |t, args| + + ActiveRecord::Base.connection.execute("INSERT INTO shops (logo, name, shop_code, subdomain, client_name, client_code, address, township, city, state, country, phone_no, reservation_no, license, activated_at, license_data, base_currency, cloud_url, cloud_token, owner_token, id_prefix, is_rounding_adj, quick_sale_summary, calc_tax_order, show_account_info, note, created_at, updated_at) + VALUES (NULL, '#{args.name}', '#{args.shop_code}', '#{args.name}-#{args.shop_code}', '#{args.client_name}', '#{args.client_code}', '#{args.address}', '', '', '', '', '#{args.phone_no}', '111', '', CURRENT_TIMESTAMP(), 'test', '111', NULL, NULL, NULL, '111', 0, 0, 0, 1, CURRENT_TIMESTAMP(), CURRENT_TIMESTAMP())") + logger.info " Shop created for #{args.name}-#{args.shop_code}" + gateway_communication_type =Lookup.create([{lookup_type:'gateway_communication_type',name: 'API',value: 'api',shop_code: args.shop_code}, {lookup_type:'gateway_communication_type',name: 'USB',value: 'usb',shop_code: args.shop_code}]) puts " Finished gateway_communication_type Set Up Data"