From 3e0eebfa88f6bd382ca38286a029155afe56f3d6 Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 10 Aug 2017 16:24:56 +0630 Subject: [PATCH 01/15] nothing change before --- app/models/order.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/models/order.rb b/app/models/order.rb index 398fb0f2..0ef19729 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -65,7 +65,6 @@ class Order < ApplicationRecord end def adding_line_items - if self.items #re-order to ordered_list = re_order_items(self.items) From 99946deea358830c030ad1117900487f1f643020 Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 10 Aug 2017 18:01:37 +0630 Subject: [PATCH 02/15] update fix for customer --- db/seeds.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/db/seeds.rb b/db/seeds.rb index 29834cb8..8bc16f74 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -99,8 +99,8 @@ customer_type = Lookup.create([{lookup_type:'customer_type', name: 'Dinein', val {lookup_type:'customer_type', name: 'Delivery', value: 'Delivery'}]) # Default CUSTOMER -customer = Customer.create({name:"WALK-IN", email: "cus1@customer.com", contact_no:"000000000",card_no:"000", customer_type:"Dinein", tax_profiles:"[\"2\", \"1\"]"}) -customer2 = Customer.create({name:"TAKEAWAY", email: "cus2@customer.com", contact_no:"111111111",card_no:"111", customer_type:"Takeaway", tax_profiles:"[\"1\"]"}) +customer = Customer.create({name:"WALK-IN", email: "cus1@customer.com", contact_no:"000000000",card_no:"000", customer_type:"Dinein", tax_profiles:["2", "1"]}) +customer2 = Customer.create({name:"TAKEAWAY", email: "cus2@customer.com", contact_no:"111111111",card_no:"111", customer_type:"Takeaway", tax_profiles:["1"]}) #Default ZOne # zone = Zone.create({id:1, name: "Normal Zone", is_active:true, created_by: "SYSTEM DEFAULT"}) From 5ffb715bd1c9ede50ad2acb81c4a972112cf53c2 Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 10 Aug 2017 18:47:29 +0630 Subject: [PATCH 03/15] add menu_item_set --- db/migrate/20170810121704_menu_item_set.rb | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 db/migrate/20170810121704_menu_item_set.rb diff --git a/db/migrate/20170810121704_menu_item_set.rb b/db/migrate/20170810121704_menu_item_set.rb new file mode 100644 index 00000000..5ab5a546 --- /dev/null +++ b/db/migrate/20170810121704_menu_item_set.rb @@ -0,0 +1,4 @@ +class MenuItemSet < ActiveRecord::Migration[5.1] + def change + end +end From 2000eb2d6c054a47db5acb57e2d49de557285134 Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 11 Aug 2017 11:27:53 +0630 Subject: [PATCH 04/15] add pivot table for menu --- db/migrate/20170810121704_menu_item_set.rb | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 db/migrate/20170810121704_menu_item_set.rb diff --git a/db/migrate/20170810121704_menu_item_set.rb b/db/migrate/20170810121704_menu_item_set.rb deleted file mode 100644 index 5ab5a546..00000000 --- a/db/migrate/20170810121704_menu_item_set.rb +++ /dev/null @@ -1,4 +0,0 @@ -class MenuItemSet < ActiveRecord::Migration[5.1] - def change - end -end From b0f2bbe899efef62a875ee77d63c07389be7f6f0 Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 11 Aug 2017 11:28:13 +0630 Subject: [PATCH 05/15] add pivot table for menu --- db/migrate/20170810121704_create_item_sets.rb | 9 +++++++++ .../20170811121704_create_menu_instance_item_sets.rb | 8 ++++++++ db/migrate/20170811121704_create_menu_item_sets.rb | 8 ++++++++ 3 files changed, 25 insertions(+) create mode 100644 db/migrate/20170810121704_create_item_sets.rb create mode 100644 db/migrate/20170811121704_create_menu_instance_item_sets.rb create mode 100644 db/migrate/20170811121704_create_menu_item_sets.rb diff --git a/db/migrate/20170810121704_create_item_sets.rb b/db/migrate/20170810121704_create_item_sets.rb new file mode 100644 index 00000000..da7fc570 --- /dev/null +++ b/db/migrate/20170810121704_create_item_sets.rb @@ -0,0 +1,9 @@ +class CreateItemSets < ActiveRecord::Migration[5.1] + def change + create_table :item_sets do |t| + t.string :name, :null => false + t.integer :min_selectable_qty + t.integer :max_selectable_qty + t.timestamps + end +end diff --git a/db/migrate/20170811121704_create_menu_instance_item_sets.rb b/db/migrate/20170811121704_create_menu_instance_item_sets.rb new file mode 100644 index 00000000..1712065b --- /dev/null +++ b/db/migrate/20170811121704_create_menu_instance_item_sets.rb @@ -0,0 +1,8 @@ +class CreateMenuInstanceItemSets < ActiveRecord::Migration[5.1] + def change + create_table :menu_instance_item_sets do |t| + t.references :item_set_id, foreign_key: true + t.references :menu_item_instance_id, foreign_key: true + t.timestamps + end +end diff --git a/db/migrate/20170811121704_create_menu_item_sets.rb b/db/migrate/20170811121704_create_menu_item_sets.rb new file mode 100644 index 00000000..1cacad00 --- /dev/null +++ b/db/migrate/20170811121704_create_menu_item_sets.rb @@ -0,0 +1,8 @@ +class CreateMenuItemSets < ActiveRecord::Migration[5.1] + def change + create_table :menu_item_sets do |t| + t.references :item_set_id, foreign_key: true + t.references :menu_item_id, foreign_key: true + t.timestamps + end +end From b7c49f5f60702e5c03fbee5a310dd6bdb7fde9c1 Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 11 Aug 2017 13:34:58 +0630 Subject: [PATCH 06/15] remove item set migrateion --- db/migrate/20170810121704_create_item_sets.rb | 9 --------- .../20170811121704_create_menu_instance_item_sets.rb | 8 -------- db/migrate/20170811121704_create_menu_item_sets.rb | 8 -------- 3 files changed, 25 deletions(-) delete mode 100644 db/migrate/20170810121704_create_item_sets.rb delete mode 100644 db/migrate/20170811121704_create_menu_instance_item_sets.rb delete mode 100644 db/migrate/20170811121704_create_menu_item_sets.rb diff --git a/db/migrate/20170810121704_create_item_sets.rb b/db/migrate/20170810121704_create_item_sets.rb deleted file mode 100644 index da7fc570..00000000 --- a/db/migrate/20170810121704_create_item_sets.rb +++ /dev/null @@ -1,9 +0,0 @@ -class CreateItemSets < ActiveRecord::Migration[5.1] - def change - create_table :item_sets do |t| - t.string :name, :null => false - t.integer :min_selectable_qty - t.integer :max_selectable_qty - t.timestamps - end -end diff --git a/db/migrate/20170811121704_create_menu_instance_item_sets.rb b/db/migrate/20170811121704_create_menu_instance_item_sets.rb deleted file mode 100644 index 1712065b..00000000 --- a/db/migrate/20170811121704_create_menu_instance_item_sets.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateMenuInstanceItemSets < ActiveRecord::Migration[5.1] - def change - create_table :menu_instance_item_sets do |t| - t.references :item_set_id, foreign_key: true - t.references :menu_item_instance_id, foreign_key: true - t.timestamps - end -end diff --git a/db/migrate/20170811121704_create_menu_item_sets.rb b/db/migrate/20170811121704_create_menu_item_sets.rb deleted file mode 100644 index 1cacad00..00000000 --- a/db/migrate/20170811121704_create_menu_item_sets.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateMenuItemSets < ActiveRecord::Migration[5.1] - def change - create_table :menu_item_sets do |t| - t.references :item_set_id, foreign_key: true - t.references :menu_item_id, foreign_key: true - t.timestamps - end -end From b7cde3125f7c74d5c777238e8954e9e6fa7bb6f3 Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 11 Aug 2017 13:44:25 +0630 Subject: [PATCH 07/15] add item set and relation --- app/models/item_set.rb | 2 ++ app/models/menu_instance_item_set.rb | 2 ++ app/models/menu_item_set.rb | 2 ++ db/migrate/20170811070634_create_item_sets.rb | 11 +++++++++++ db/migrate/20170811071108_create_menu_item_sets.rb | 10 ++++++++++ .../20170811071327_create_menu_instance_item_sets.rb | 10 ++++++++++ spec/models/item_set_spec.rb | 5 +++++ spec/models/menu_instance_item_set_spec.rb | 5 +++++ spec/models/menu_item_set_spec.rb | 5 +++++ 9 files changed, 52 insertions(+) create mode 100644 app/models/item_set.rb create mode 100644 app/models/menu_instance_item_set.rb create mode 100644 app/models/menu_item_set.rb create mode 100644 db/migrate/20170811070634_create_item_sets.rb create mode 100644 db/migrate/20170811071108_create_menu_item_sets.rb create mode 100644 db/migrate/20170811071327_create_menu_instance_item_sets.rb create mode 100644 spec/models/item_set_spec.rb create mode 100644 spec/models/menu_instance_item_set_spec.rb create mode 100644 spec/models/menu_item_set_spec.rb diff --git a/app/models/item_set.rb b/app/models/item_set.rb new file mode 100644 index 00000000..83c32c82 --- /dev/null +++ b/app/models/item_set.rb @@ -0,0 +1,2 @@ +class ItemSet < ApplicationRecord +end diff --git a/app/models/menu_instance_item_set.rb b/app/models/menu_instance_item_set.rb new file mode 100644 index 00000000..6674c0c2 --- /dev/null +++ b/app/models/menu_instance_item_set.rb @@ -0,0 +1,2 @@ +class MenuInstanceItemSet < ApplicationRecord +end diff --git a/app/models/menu_item_set.rb b/app/models/menu_item_set.rb new file mode 100644 index 00000000..407924bd --- /dev/null +++ b/app/models/menu_item_set.rb @@ -0,0 +1,2 @@ +class MenuItemSet < ApplicationRecord +end diff --git a/db/migrate/20170811070634_create_item_sets.rb b/db/migrate/20170811070634_create_item_sets.rb new file mode 100644 index 00000000..d666222c --- /dev/null +++ b/db/migrate/20170811070634_create_item_sets.rb @@ -0,0 +1,11 @@ +class CreateItemSets < ActiveRecord::Migration[5.1] + def change + create_table :item_sets do |t| + t.string :name + t.integer :min_selectable_qty + t.integer :max_selectable_qty + + t.timestamps + end + end +end diff --git a/db/migrate/20170811071108_create_menu_item_sets.rb b/db/migrate/20170811071108_create_menu_item_sets.rb new file mode 100644 index 00000000..f423ea7b --- /dev/null +++ b/db/migrate/20170811071108_create_menu_item_sets.rb @@ -0,0 +1,10 @@ +class CreateMenuItemSets < ActiveRecord::Migration[5.1] + def change + create_table :menu_item_sets do |t| + t.references :item_set_id, foreign_key: true + t.references :menu_item_id, foreign_key: true + + t.timestamps + end + end +end diff --git a/db/migrate/20170811071327_create_menu_instance_item_sets.rb b/db/migrate/20170811071327_create_menu_instance_item_sets.rb new file mode 100644 index 00000000..b25ba8b6 --- /dev/null +++ b/db/migrate/20170811071327_create_menu_instance_item_sets.rb @@ -0,0 +1,10 @@ +class CreateMenuInstanceItemSets < ActiveRecord::Migration[5.1] + def change + create_table :menu_instance_item_sets do |t| + t.references :item_set_id, foreign_key: true + t.references :menu_item_instance_id, foreign_key: true + + t.timestamps + end + end +end diff --git a/spec/models/item_set_spec.rb b/spec/models/item_set_spec.rb new file mode 100644 index 00000000..70c14cff --- /dev/null +++ b/spec/models/item_set_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe ItemSet, type: :model do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/models/menu_instance_item_set_spec.rb b/spec/models/menu_instance_item_set_spec.rb new file mode 100644 index 00000000..5711f7e7 --- /dev/null +++ b/spec/models/menu_instance_item_set_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe MenuInstanceItemSet, type: :model do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/models/menu_item_set_spec.rb b/spec/models/menu_item_set_spec.rb new file mode 100644 index 00000000..f3c82b26 --- /dev/null +++ b/spec/models/menu_item_set_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe MenuItemSet, type: :model do + pending "add some examples to (or delete) #{__FILE__}" +end From 12d3e70b197efb866296bd041a4a264fc26db7ed Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 11 Aug 2017 14:23:33 +0630 Subject: [PATCH 08/15] update model for menu --- app/models/item_set.rb | 5 +++++ app/models/menu_instance_item_set.rb | 2 ++ app/models/menu_item.rb | 3 +++ app/models/menu_item_set.rb | 2 ++ 4 files changed, 12 insertions(+) diff --git a/app/models/item_set.rb b/app/models/item_set.rb index 83c32c82..379347a3 100644 --- a/app/models/item_set.rb +++ b/app/models/item_set.rb @@ -1,2 +1,7 @@ class ItemSet < ApplicationRecord + has_many :menu_item_sets + has_many :menu_items, through: :menu_item_sets + + has_many :menu_instance_item_sets + has_many :menu_item_instances, through: :menu_item_sets end diff --git a/app/models/menu_instance_item_set.rb b/app/models/menu_instance_item_set.rb index 6674c0c2..bc1d7aaf 100644 --- a/app/models/menu_instance_item_set.rb +++ b/app/models/menu_instance_item_set.rb @@ -1,2 +1,4 @@ class MenuInstanceItemSet < ApplicationRecord + belongs_to :item_set + belongs_to :menu_item_instance end diff --git a/app/models/menu_item.rb b/app/models/menu_item.rb index 1f1afbe4..0db0cda4 100644 --- a/app/models/menu_item.rb +++ b/app/models/menu_item.rb @@ -8,6 +8,9 @@ class MenuItem < ApplicationRecord has_many :children, :class_name => "MenuItem", foreign_key: "menu_item_id" belongs_to :account + has_many :menu_item_sets + has_many :item_sets, through: :menu_item_sets + validates_presence_of :name, :type, :min_qty, :taxable, :min_selectable_item, :max_selectable_item default_scope { order('item_code asc') } diff --git a/app/models/menu_item_set.rb b/app/models/menu_item_set.rb index 407924bd..a39b8522 100644 --- a/app/models/menu_item_set.rb +++ b/app/models/menu_item_set.rb @@ -1,2 +1,4 @@ class MenuItemSet < ApplicationRecord + belongs_to :item_set + belongs_to :menu_item end From be71d187b0f1f83536051c972c6b985cc493aa1b Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 11 Aug 2017 15:00:24 +0630 Subject: [PATCH 09/15] update menu --- app/models/menu_category.rb | 8 ++++---- app/models/menu_item.rb | 11 +++++------ app/models/menu_item_instance.rb | 10 +++++----- app/views/settings/menu_categories/show.html.erb | 2 +- db/migrate/20170811071108_create_menu_item_sets.rb | 4 ++-- .../20170811071327_create_menu_instance_item_sets.rb | 4 ++-- 6 files changed, 19 insertions(+), 20 deletions(-) diff --git a/app/models/menu_category.rb b/app/models/menu_category.rb index 71ad42c8..29484bcc 100644 --- a/app/models/menu_category.rb +++ b/app/models/menu_category.rb @@ -1,5 +1,5 @@ class MenuCategory < ApplicationRecord - before_create :generate_menu_category_code + # before_create :generate_menu_category_code belongs_to :menu has_many :children, :class_name => "MenuCategory", foreign_key: "menu_category_id" @@ -37,7 +37,7 @@ class MenuCategory < ApplicationRecord private - def generate_menu_category_code - self.code = SeedGenerator.generate_code(self.class.name, "C") - end + # def generate_menu_category_code + # self.code = SeedGenerator.generate_code(self.class.name, "C") + # end end diff --git a/app/models/menu_item.rb b/app/models/menu_item.rb index 0db0cda4..4a661c14 100644 --- a/app/models/menu_item.rb +++ b/app/models/menu_item.rb @@ -1,6 +1,5 @@ class MenuItem < ApplicationRecord - - before_create :generate_menu_item_code + # before_create :generate_menu_item_code belongs_to :menu_category, :optional => true has_many :menu_item_instances @@ -73,10 +72,10 @@ class MenuItem < ApplicationRecord end - private + # private - def generate_menu_item_code - self.item_code = SeedGenerator.generate_code(self.class.name, "I") - end + # def generate_menu_item_code + # self.item_code = SeedGenerator.generate_code(self.class.name, "I") + # end end diff --git a/app/models/menu_item_instance.rb b/app/models/menu_item_instance.rb index f39c29a2..579b7a5a 100644 --- a/app/models/menu_item_instance.rb +++ b/app/models/menu_item_instance.rb @@ -1,6 +1,6 @@ class MenuItemInstance < ApplicationRecord belongs_to :menu_item - before_create :generate_menu_item_instance_code + # before_create :generate_menu_item_instance_code def self.findParentCategory(item) if item.menu_category_id @@ -11,9 +11,9 @@ class MenuItemInstance < ApplicationRecord end end - private + # private - def generate_menu_item_instance_code - self.item_instance_code = SeedGenerator.generate_code(self.class.name, "II") - end + # def generate_menu_item_instance_code + # self.item_instance_code = SeedGenerator.generate_code(self.class.name, "II") + # end end diff --git a/app/views/settings/menu_categories/show.html.erb b/app/views/settings/menu_categories/show.html.erb index 25c3c9ba..7e1f44af 100644 --- a/app/views/settings/menu_categories/show.html.erb +++ b/app/views/settings/menu_categories/show.html.erb @@ -1,6 +1,6 @@
    -
  • Home
    • +
  • Home
  • Menus Categories
  • Details
    • diff --git a/db/migrate/20170811071108_create_menu_item_sets.rb b/db/migrate/20170811071108_create_menu_item_sets.rb index f423ea7b..1d4109f9 100644 --- a/db/migrate/20170811071108_create_menu_item_sets.rb +++ b/db/migrate/20170811071108_create_menu_item_sets.rb @@ -1,8 +1,8 @@ class CreateMenuItemSets < ActiveRecord::Migration[5.1] def change create_table :menu_item_sets do |t| - t.references :item_set_id, foreign_key: true - t.references :menu_item_id, foreign_key: true + t.references :item_set, foreign_key: true + t.references :menu_item, foreign_key: true t.timestamps end diff --git a/db/migrate/20170811071327_create_menu_instance_item_sets.rb b/db/migrate/20170811071327_create_menu_instance_item_sets.rb index b25ba8b6..89f08f41 100644 --- a/db/migrate/20170811071327_create_menu_instance_item_sets.rb +++ b/db/migrate/20170811071327_create_menu_instance_item_sets.rb @@ -1,8 +1,8 @@ class CreateMenuInstanceItemSets < ActiveRecord::Migration[5.1] def change create_table :menu_instance_item_sets do |t| - t.references :item_set_id, foreign_key: true - t.references :menu_item_instance_id, foreign_key: true + t.references :item_set, foreign_key: true + t.references :menu_item_instance, foreign_key: true t.timestamps end From 03a6208a766c903acda8ff9611a08d490dca132e Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 11 Aug 2017 17:41:10 +0630 Subject: [PATCH 10/15] add item set with scaffold --- .../javascripts/settings/item_sets.coffee | 3 + .../stylesheets/settings/item_sets.scss | 3 + .../settings/item_sets_controller.rb | 74 +++++++++ app/helpers/settings/item_sets_helper.rb | 2 + app/models/item_set.rb | 2 +- app/models/settings/item_set.rb | 2 + app/views/settings/item_sets/_form.html.erb | 13 ++ .../_settings_item_set.json.jbuilder | 2 + app/views/settings/item_sets/edit.html.erb | 6 + app/views/settings/item_sets/index.html.erb | 31 ++++ .../settings/item_sets/index.json.jbuilder | 1 + app/views/settings/item_sets/new.html.erb | 5 + app/views/settings/item_sets/show.html.erb | 19 +++ .../settings/item_sets/show.json.jbuilder | 1 + config/routes.rb | 3 + ....rb => 20170811071000_create_item_sets.rb} | 0 .../settings/item_sets_controller_spec.rb | 141 ++++++++++++++++++ .../helpers/settings/item_sets_helper_spec.rb | 15 ++ spec/models/settings/item_set_spec.rb | 5 + .../settings/settings_item_sets_spec.rb | 10 ++ .../settings/item_sets_routing_spec.rb | 39 +++++ .../settings/item_sets/edit.html.erb_spec.rb | 24 +++ .../settings/item_sets/index.html.erb_spec.rb | 25 ++++ .../settings/item_sets/new.html.erb_spec.rb | 24 +++ .../settings/item_sets/show.html.erb_spec.rb | 18 +++ test/system/item_sets_test.rb | 9 ++ 26 files changed, 476 insertions(+), 1 deletion(-) create mode 100644 app/assets/javascripts/settings/item_sets.coffee create mode 100644 app/assets/stylesheets/settings/item_sets.scss create mode 100644 app/controllers/settings/item_sets_controller.rb create mode 100644 app/helpers/settings/item_sets_helper.rb create mode 100644 app/models/settings/item_set.rb create mode 100644 app/views/settings/item_sets/_form.html.erb create mode 100644 app/views/settings/item_sets/_settings_item_set.json.jbuilder create mode 100644 app/views/settings/item_sets/edit.html.erb create mode 100644 app/views/settings/item_sets/index.html.erb create mode 100644 app/views/settings/item_sets/index.json.jbuilder create mode 100644 app/views/settings/item_sets/new.html.erb create mode 100644 app/views/settings/item_sets/show.html.erb create mode 100644 app/views/settings/item_sets/show.json.jbuilder rename db/migrate/{20170811070634_create_item_sets.rb => 20170811071000_create_item_sets.rb} (100%) create mode 100644 spec/controllers/settings/item_sets_controller_spec.rb create mode 100644 spec/helpers/settings/item_sets_helper_spec.rb create mode 100644 spec/models/settings/item_set_spec.rb create mode 100644 spec/requests/settings/settings_item_sets_spec.rb create mode 100644 spec/routing/settings/item_sets_routing_spec.rb create mode 100644 spec/views/settings/item_sets/edit.html.erb_spec.rb create mode 100644 spec/views/settings/item_sets/index.html.erb_spec.rb create mode 100644 spec/views/settings/item_sets/new.html.erb_spec.rb create mode 100644 spec/views/settings/item_sets/show.html.erb_spec.rb create mode 100644 test/system/item_sets_test.rb diff --git a/app/assets/javascripts/settings/item_sets.coffee b/app/assets/javascripts/settings/item_sets.coffee new file mode 100644 index 00000000..24f83d18 --- /dev/null +++ b/app/assets/javascripts/settings/item_sets.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/stylesheets/settings/item_sets.scss b/app/assets/stylesheets/settings/item_sets.scss new file mode 100644 index 00000000..004d8d6b --- /dev/null +++ b/app/assets/stylesheets/settings/item_sets.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Settings/ItemSets controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/settings/item_sets_controller.rb b/app/controllers/settings/item_sets_controller.rb new file mode 100644 index 00000000..226071ef --- /dev/null +++ b/app/controllers/settings/item_sets_controller.rb @@ -0,0 +1,74 @@ +class Settings::ItemSetsController < ApplicationController + before_action :set_settings_item_set, only: [:show, :edit, :update, :destroy] + + # GET /settings/item_sets + # GET /settings/item_sets.json + def index + @settings_item_sets = ItemSet.all + end + + # GET /settings/item_sets/1 + # GET /settings/item_sets/1.json + def show + end + + # GET /settings/item_sets/new + def new + @settings_item_set = ItemSet.new + end + + # GET /settings/item_sets/1/edit + def edit + end + + # POST /settings/item_sets + # POST /settings/item_sets.json + def create + @settings_item_set = ItemSet.new(settings_item_set_params) + + respond_to do |format| + if @settings_item_set.save + format.html { redirect_to @settings_item_set, notice: 'Item set was successfully created.' } + format.json { render :show, status: :created, location: @settings_item_set } + else + format.html { render :new } + format.json { render json: @settings_item_set.errors, status: :unprocessable_entity } + end + end + end + + # PATCH/PUT /settings/item_sets/1 + # PATCH/PUT /settings/item_sets/1.json + def update + respond_to do |format| + if @settings_item_set.update(settings_item_set_params) + format.html { redirect_to @settings_item_set, notice: 'Item set was successfully updated.' } + format.json { render :show, status: :ok, location: @settings_item_set } + else + format.html { render :edit } + format.json { render json: @settings_item_set.errors, status: :unprocessable_entity } + end + end + end + + # DELETE /settings/item_sets/1 + # DELETE /settings/item_sets/1.json + def destroy + @settings_item_set.destroy + respond_to do |format| + format.html { redirect_to settings_item_sets_url, notice: 'Item set was successfully destroyed.' } + format.json { head :no_content } + end + end + + private + # Use callbacks to share common setup or constraints between actions. + def set_settings_item_set + @settings_item_set = ItemSet.find(params[:id]) + end + + # Never trust parameters from the scary internet, only allow the white list through. + def settings_item_set_params + params.require(:settings_item_set).permit(:name, :min_selectable_qty, :max_selectable_qty) + end +end diff --git a/app/helpers/settings/item_sets_helper.rb b/app/helpers/settings/item_sets_helper.rb new file mode 100644 index 00000000..59c3b632 --- /dev/null +++ b/app/helpers/settings/item_sets_helper.rb @@ -0,0 +1,2 @@ +module Settings::ItemSetsHelper +end diff --git a/app/models/item_set.rb b/app/models/item_set.rb index 379347a3..55bc0c6b 100644 --- a/app/models/item_set.rb +++ b/app/models/item_set.rb @@ -3,5 +3,5 @@ class ItemSet < ApplicationRecord has_many :menu_items, through: :menu_item_sets has_many :menu_instance_item_sets - has_many :menu_item_instances, through: :menu_item_sets + has_many :menu_item_instances, through: :menu_instance_item_sets end diff --git a/app/models/settings/item_set.rb b/app/models/settings/item_set.rb new file mode 100644 index 00000000..dcedbbca --- /dev/null +++ b/app/models/settings/item_set.rb @@ -0,0 +1,2 @@ +class Settings::ItemSet < ApplicationRecord +end diff --git a/app/views/settings/item_sets/_form.html.erb b/app/views/settings/item_sets/_form.html.erb new file mode 100644 index 00000000..4e2760cd --- /dev/null +++ b/app/views/settings/item_sets/_form.html.erb @@ -0,0 +1,13 @@ +<%= simple_form_for(@settings_item_set) do |f| %> + <%= f.error_notification %> + +
    + <%= f.input :name %> + <%= f.input :min_selectable_qty %> + <%= f.input :max_selectable_qty %> +
    + +
    + <%= f.button :submit %> +
    +<% end %> diff --git a/app/views/settings/item_sets/_settings_item_set.json.jbuilder b/app/views/settings/item_sets/_settings_item_set.json.jbuilder new file mode 100644 index 00000000..44a15ef8 --- /dev/null +++ b/app/views/settings/item_sets/_settings_item_set.json.jbuilder @@ -0,0 +1,2 @@ +json.extract! settings_item_set, :id, :name, :min_selectable_qty, :max_selectable_qty, :created_at, :updated_at +json.url settings_item_set_url(settings_item_set, format: :json) diff --git a/app/views/settings/item_sets/edit.html.erb b/app/views/settings/item_sets/edit.html.erb new file mode 100644 index 00000000..75a7f10a --- /dev/null +++ b/app/views/settings/item_sets/edit.html.erb @@ -0,0 +1,6 @@ +

    Editing Settings Item Set

    + +<%= render 'form', settings_item_set: @settings_item_set %> + +<%= link_to 'Show', @settings_item_set %> | +<%= link_to 'Back', settings_item_sets_path %> diff --git a/app/views/settings/item_sets/index.html.erb b/app/views/settings/item_sets/index.html.erb new file mode 100644 index 00000000..f5b50ad6 --- /dev/null +++ b/app/views/settings/item_sets/index.html.erb @@ -0,0 +1,31 @@ +

    <%= notice %>

    + +

    Settings Item Sets

    + + + + + + + + + + + + + <% @settings_item_sets.each do |settings_item_set| %> + + + + + + + + + <% end %> + +
    NameMin selectable qtyMax selectable qty
    <%= settings_item_set.name %><%= settings_item_set.min_selectable_qty %><%= settings_item_set.max_selectable_qty %><%= link_to 'Show', settings_item_set %><%= link_to 'Edit', edit_settings_item_set_path(settings_item_set) %><%= link_to 'Destroy', settings_item_set, method: :delete, data: { confirm: 'Are you sure?' } %>
    + +
    + +<%= link_to 'New Settings Item Set', new_settings_item_set_path %> diff --git a/app/views/settings/item_sets/index.json.jbuilder b/app/views/settings/item_sets/index.json.jbuilder new file mode 100644 index 00000000..ae5e4391 --- /dev/null +++ b/app/views/settings/item_sets/index.json.jbuilder @@ -0,0 +1 @@ +json.array! @settings_item_sets, partial: 'settings_item_sets/settings_item_set', as: :settings_item_set diff --git a/app/views/settings/item_sets/new.html.erb b/app/views/settings/item_sets/new.html.erb new file mode 100644 index 00000000..a2773f42 --- /dev/null +++ b/app/views/settings/item_sets/new.html.erb @@ -0,0 +1,5 @@ +

    New Settings Item Set

    + +<%= render 'form', settings_item_set: @settings_item_set %> + +<%= link_to 'Back', settings_item_sets_path %> diff --git a/app/views/settings/item_sets/show.html.erb b/app/views/settings/item_sets/show.html.erb new file mode 100644 index 00000000..5f7b01d0 --- /dev/null +++ b/app/views/settings/item_sets/show.html.erb @@ -0,0 +1,19 @@ +

    <%= notice %>

    + +

    + Name: + <%= @settings_item_set.name %> +

    + +

    + Min selectable qty: + <%= @settings_item_set.min_selectable_qty %> +

    + +

    + Max selectable qty: + <%= @settings_item_set.max_selectable_qty %> +

    + +<%= link_to 'Edit', edit_settings_item_set_path(@settings_item_set) %> | +<%= link_to 'Back', settings_item_sets_path %> diff --git a/app/views/settings/item_sets/show.json.jbuilder b/app/views/settings/item_sets/show.json.jbuilder new file mode 100644 index 00000000..db3c9813 --- /dev/null +++ b/app/views/settings/item_sets/show.json.jbuilder @@ -0,0 +1 @@ +json.partial! "settings_item_sets/settings_item_set", settings_item_set: @settings_item_set diff --git a/config/routes.rb b/config/routes.rb index 0753b64b..4b5cd9f5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,6 +2,9 @@ require 'sidekiq/web' Rails.application.routes.draw do + namespace :settings do + resources :item_sets + end root 'home#index' mount Sidekiq::Web => '/kiq' diff --git a/db/migrate/20170811070634_create_item_sets.rb b/db/migrate/20170811071000_create_item_sets.rb similarity index 100% rename from db/migrate/20170811070634_create_item_sets.rb rename to db/migrate/20170811071000_create_item_sets.rb diff --git a/spec/controllers/settings/item_sets_controller_spec.rb b/spec/controllers/settings/item_sets_controller_spec.rb new file mode 100644 index 00000000..46593eff --- /dev/null +++ b/spec/controllers/settings/item_sets_controller_spec.rb @@ -0,0 +1,141 @@ +require 'rails_helper' + +# This spec was generated by rspec-rails when you ran the scaffold generator. +# It demonstrates how one might use RSpec to specify the controller code that +# was generated by Rails when you ran the scaffold generator. +# +# It assumes that the implementation code is generated by the rails scaffold +# generator. If you are using any extension libraries to generate different +# controller code, this generated spec may or may not pass. +# +# It only uses APIs available in rails and/or rspec-rails. There are a number +# of tools you can use to make these specs even more expressive, but we're +# sticking to rails and rspec-rails APIs to keep things simple and stable. +# +# Compared to earlier versions of this generator, there is very limited use of +# stubs and message expectations in this spec. Stubs are only used when there +# is no simpler way to get a handle on the object needed for the example. +# Message expectations are only used when there is no simpler way to specify +# that an instance is receiving a specific message. +# +# Also compared to earlier versions of this generator, there are no longer any +# expectations of assigns and templates rendered. These features have been +# removed from Rails core in Rails 5, but can be added back in via the +# `rails-controller-testing` gem. + +RSpec.describe Settings::ItemSetsController, type: :controller do + + # This should return the minimal set of attributes required to create a valid + # Settings::ItemSet. As you add validations to Settings::ItemSet, be sure to + # adjust the attributes here as well. + let(:valid_attributes) { + skip("Add a hash of attributes valid for your model") + } + + let(:invalid_attributes) { + skip("Add a hash of attributes invalid for your model") + } + + # This should return the minimal set of values that should be in the session + # in order to pass any filters (e.g. authentication) defined in + # Settings::ItemSetsController. Be sure to keep this updated too. + let(:valid_session) { {} } + + describe "GET #index" do + it "returns a success response" do + item_set = Settings::ItemSet.create! valid_attributes + get :index, params: {}, session: valid_session + expect(response).to be_success + end + end + + describe "GET #show" do + it "returns a success response" do + item_set = Settings::ItemSet.create! valid_attributes + get :show, params: {id: item_set.to_param}, session: valid_session + expect(response).to be_success + end + end + + describe "GET #new" do + it "returns a success response" do + get :new, params: {}, session: valid_session + expect(response).to be_success + end + end + + describe "GET #edit" do + it "returns a success response" do + item_set = Settings::ItemSet.create! valid_attributes + get :edit, params: {id: item_set.to_param}, session: valid_session + expect(response).to be_success + end + end + + describe "POST #create" do + context "with valid params" do + it "creates a new Settings::ItemSet" do + expect { + post :create, params: {settings_item_set: valid_attributes}, session: valid_session + }.to change(Settings::ItemSet, :count).by(1) + end + + it "redirects to the created settings_item_set" do + post :create, params: {settings_item_set: valid_attributes}, session: valid_session + expect(response).to redirect_to(Settings::ItemSet.last) + end + end + + context "with invalid params" do + it "returns a success response (i.e. to display the 'new' template)" do + post :create, params: {settings_item_set: invalid_attributes}, session: valid_session + expect(response).to be_success + end + end + end + + describe "PUT #update" do + context "with valid params" do + let(:new_attributes) { + skip("Add a hash of attributes valid for your model") + } + + it "updates the requested settings_item_set" do + item_set = Settings::ItemSet.create! valid_attributes + put :update, params: {id: item_set.to_param, settings_item_set: new_attributes}, session: valid_session + item_set.reload + skip("Add assertions for updated state") + end + + it "redirects to the settings_item_set" do + item_set = Settings::ItemSet.create! valid_attributes + put :update, params: {id: item_set.to_param, settings_item_set: valid_attributes}, session: valid_session + expect(response).to redirect_to(item_set) + end + end + + context "with invalid params" do + it "returns a success response (i.e. to display the 'edit' template)" do + item_set = Settings::ItemSet.create! valid_attributes + put :update, params: {id: item_set.to_param, settings_item_set: invalid_attributes}, session: valid_session + expect(response).to be_success + end + end + end + + describe "DELETE #destroy" do + it "destroys the requested settings_item_set" do + item_set = Settings::ItemSet.create! valid_attributes + expect { + delete :destroy, params: {id: item_set.to_param}, session: valid_session + }.to change(Settings::ItemSet, :count).by(-1) + end + + it "redirects to the settings_item_sets list" do + item_set = Settings::ItemSet.create! valid_attributes + delete :destroy, params: {id: item_set.to_param}, session: valid_session + expect(response).to redirect_to(settings_item_sets_url) + end + end + +end diff --git a/spec/helpers/settings/item_sets_helper_spec.rb b/spec/helpers/settings/item_sets_helper_spec.rb new file mode 100644 index 00000000..b34f883a --- /dev/null +++ b/spec/helpers/settings/item_sets_helper_spec.rb @@ -0,0 +1,15 @@ +require 'rails_helper' + +# Specs in this file have access to a helper object that includes +# the Settings::ItemSetsHelper. For example: +# +# describe Settings::ItemSetsHelper do +# describe "string concat" do +# it "concats two strings with spaces" do +# expect(helper.concat_strings("this","that")).to eq("this that") +# end +# end +# end +RSpec.describe Settings::ItemSetsHelper, type: :helper do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/models/settings/item_set_spec.rb b/spec/models/settings/item_set_spec.rb new file mode 100644 index 00000000..fcaee254 --- /dev/null +++ b/spec/models/settings/item_set_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe Settings::ItemSet, type: :model do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/requests/settings/settings_item_sets_spec.rb b/spec/requests/settings/settings_item_sets_spec.rb new file mode 100644 index 00000000..439abdaa --- /dev/null +++ b/spec/requests/settings/settings_item_sets_spec.rb @@ -0,0 +1,10 @@ +require 'rails_helper' + +RSpec.describe "Settings::ItemSets", type: :request do + describe "GET /settings_item_sets" do + it "works! (now write some real specs)" do + get settings_item_sets_path + expect(response).to have_http_status(200) + end + end +end diff --git a/spec/routing/settings/item_sets_routing_spec.rb b/spec/routing/settings/item_sets_routing_spec.rb new file mode 100644 index 00000000..45d308b7 --- /dev/null +++ b/spec/routing/settings/item_sets_routing_spec.rb @@ -0,0 +1,39 @@ +require "rails_helper" + +RSpec.describe Settings::ItemSetsController, type: :routing do + describe "routing" do + + it "routes to #index" do + expect(:get => "/settings/item_sets").to route_to("settings/item_sets#index") + end + + it "routes to #new" do + expect(:get => "/settings/item_sets/new").to route_to("settings/item_sets#new") + end + + it "routes to #show" do + expect(:get => "/settings/item_sets/1").to route_to("settings/item_sets#show", :id => "1") + end + + it "routes to #edit" do + expect(:get => "/settings/item_sets/1/edit").to route_to("settings/item_sets#edit", :id => "1") + end + + it "routes to #create" do + expect(:post => "/settings/item_sets").to route_to("settings/item_sets#create") + end + + it "routes to #update via PUT" do + expect(:put => "/settings/item_sets/1").to route_to("settings/item_sets#update", :id => "1") + end + + it "routes to #update via PATCH" do + expect(:patch => "/settings/item_sets/1").to route_to("settings/item_sets#update", :id => "1") + end + + it "routes to #destroy" do + expect(:delete => "/settings/item_sets/1").to route_to("settings/item_sets#destroy", :id => "1") + end + + end +end diff --git a/spec/views/settings/item_sets/edit.html.erb_spec.rb b/spec/views/settings/item_sets/edit.html.erb_spec.rb new file mode 100644 index 00000000..5add21aa --- /dev/null +++ b/spec/views/settings/item_sets/edit.html.erb_spec.rb @@ -0,0 +1,24 @@ +require 'rails_helper' + +RSpec.describe "settings/item_sets/edit", type: :view do + before(:each) do + @settings_item_set = assign(:settings_item_set, Settings::ItemSet.create!( + :name => "MyString", + :min_selectable_qty => 1, + :max_selectable_qty => 1 + )) + end + + it "renders the edit settings_item_set form" do + render + + assert_select "form[action=?][method=?]", settings_item_set_path(@settings_item_set), "post" do + + assert_select "input[name=?]", "settings_item_set[name]" + + assert_select "input[name=?]", "settings_item_set[min_selectable_qty]" + + assert_select "input[name=?]", "settings_item_set[max_selectable_qty]" + end + end +end diff --git a/spec/views/settings/item_sets/index.html.erb_spec.rb b/spec/views/settings/item_sets/index.html.erb_spec.rb new file mode 100644 index 00000000..3dcf7fb2 --- /dev/null +++ b/spec/views/settings/item_sets/index.html.erb_spec.rb @@ -0,0 +1,25 @@ +require 'rails_helper' + +RSpec.describe "settings/item_sets/index", type: :view do + before(:each) do + assign(:settings_item_sets, [ + Settings::ItemSet.create!( + :name => "Name", + :min_selectable_qty => 2, + :max_selectable_qty => 3 + ), + Settings::ItemSet.create!( + :name => "Name", + :min_selectable_qty => 2, + :max_selectable_qty => 3 + ) + ]) + end + + it "renders a list of settings/item_sets" do + render + assert_select "tr>td", :text => "Name".to_s, :count => 2 + assert_select "tr>td", :text => 2.to_s, :count => 2 + assert_select "tr>td", :text => 3.to_s, :count => 2 + end +end diff --git a/spec/views/settings/item_sets/new.html.erb_spec.rb b/spec/views/settings/item_sets/new.html.erb_spec.rb new file mode 100644 index 00000000..fc04e612 --- /dev/null +++ b/spec/views/settings/item_sets/new.html.erb_spec.rb @@ -0,0 +1,24 @@ +require 'rails_helper' + +RSpec.describe "settings/item_sets/new", type: :view do + before(:each) do + assign(:settings_item_set, Settings::ItemSet.new( + :name => "MyString", + :min_selectable_qty => 1, + :max_selectable_qty => 1 + )) + end + + it "renders new settings_item_set form" do + render + + assert_select "form[action=?][method=?]", settings_item_sets_path, "post" do + + assert_select "input[name=?]", "settings_item_set[name]" + + assert_select "input[name=?]", "settings_item_set[min_selectable_qty]" + + assert_select "input[name=?]", "settings_item_set[max_selectable_qty]" + end + end +end diff --git a/spec/views/settings/item_sets/show.html.erb_spec.rb b/spec/views/settings/item_sets/show.html.erb_spec.rb new file mode 100644 index 00000000..4e4b9b2c --- /dev/null +++ b/spec/views/settings/item_sets/show.html.erb_spec.rb @@ -0,0 +1,18 @@ +require 'rails_helper' + +RSpec.describe "settings/item_sets/show", type: :view do + before(:each) do + @settings_item_set = assign(:settings_item_set, Settings::ItemSet.create!( + :name => "Name", + :min_selectable_qty => 2, + :max_selectable_qty => 3 + )) + end + + it "renders attributes in

    " do + render + expect(rendered).to match(/Name/) + expect(rendered).to match(/2/) + expect(rendered).to match(/3/) + end +end diff --git a/test/system/item_sets_test.rb b/test/system/item_sets_test.rb new file mode 100644 index 00000000..c162d36f --- /dev/null +++ b/test/system/item_sets_test.rb @@ -0,0 +1,9 @@ +require "application_system_test_case" + +class Settings::ItemSetsTest < ApplicationSystemTestCase + # test "visiting the index" do + # visit settings_item_sets_url + # + # assert_selector "h1", text: "Settings::ItemSet" + # end +end From f8c7630b97150d79e39855f28a0da15770c42c83 Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 14 Aug 2017 10:28:23 +0630 Subject: [PATCH 11/15] updating item_set --- app/models/settings/item_set.rb | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 app/models/settings/item_set.rb diff --git a/app/models/settings/item_set.rb b/app/models/settings/item_set.rb deleted file mode 100644 index dcedbbca..00000000 --- a/app/models/settings/item_set.rb +++ /dev/null @@ -1,2 +0,0 @@ -class Settings::ItemSet < ApplicationRecord -end From 74d7adbaef3f19df278c4588fd6ad2fa15057e54 Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 14 Aug 2017 14:27:37 +0630 Subject: [PATCH 12/15] deving item sets --- app/controllers/settings/item_sets_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/settings/item_sets_controller.rb b/app/controllers/settings/item_sets_controller.rb index 226071ef..ace39027 100644 --- a/app/controllers/settings/item_sets_controller.rb +++ b/app/controllers/settings/item_sets_controller.rb @@ -14,7 +14,7 @@ class Settings::ItemSetsController < ApplicationController # GET /settings/item_sets/new def new - @settings_item_set = ItemSet.new + @settings_item_set = ItemSet.new end # GET /settings/item_sets/1/edit From a691eb8d648931d503072584e656df43c6bd298d Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 14 Aug 2017 15:01:44 +0630 Subject: [PATCH 13/15] update --- app/controllers/origami/customers_controller.rb | 5 +++-- app/models/sale.rb | 2 +- app/views/oqs/home/index.html.erb | 17 ++++++++++------- app/views/origami/home/index.html.erb | 2 +- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb index ec826416..c67fece5 100644 --- a/app/controllers/origami/customers_controller.rb +++ b/app/controllers/origami/customers_controller.rb @@ -60,6 +60,7 @@ class Origami::CustomersController < BaseOrigamiController id = params[:sale_id][0,3] customer_id = params[:customer_id] + customer = Customer.find(customer_id) # Check and find with card no # if(!customer_id.include? "CUS") @@ -74,7 +75,7 @@ class Origami::CustomersController < BaseOrigamiController status = sale.update_attributes(customer_id: customer_id) sale.sale_orders.each do |sale_order| order = Order.find(sale_order.order_id) - status = order.update_attributes(customer_id: customer_id) + status = order.update_attributes(customer_id: customer_id,order_type:customer.customer_type) end else @booking = BookingOrder.find_by_order_id(params[:sale_id]) @@ -82,7 +83,7 @@ class Origami::CustomersController < BaseOrigamiController @orders.each do |bo| order = Order.find(bo.order_id) - status = order.update_attributes(customer_id: customer_id) + status = order.update_attributes(customer_id: customer_id,order_type:customer.customer_type) end end diff --git a/app/models/sale.rb b/app/models/sale.rb index 9f4ae9f7..1e47af6f 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -91,7 +91,7 @@ class Sale < ApplicationRecord add_item(item) end - # link_order_sale(order.id) + link_order_sale(order.id) end self.save! diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb index 81e14467..824618e6 100644 --- a/app/views/oqs/home/index.html.erb +++ b/app/views/oqs/home/index.html.erb @@ -1,16 +1,19 @@ +

    <%= form_tag oqs_root_path, :method => :get do %> -
    - -
    +
    + +
    -
    - -
    -<% end %> +
    + +
    + + <% end %>
    +
    diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb index e3193a98..05094504 100644 --- a/app/views/origami/home/index.html.erb +++ b/app/views/origami/home/index.html.erb @@ -109,7 +109,7 @@ <%if current_login_employee.role == "cashier" && @shop.quick_sale_summary == true%> - + <%end%> From 74200bb2e738947337b949997277e8ed61d7b661 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 15 Aug 2017 10:16:25 +0630 Subject: [PATCH 14/15] update receipt bill pdf for foc and credit --- app/pdf/receipt_bill_pdf.rb | 39 ++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb index 1dbea502..00ef0a7b 100644 --- a/app/pdf/receipt_bill_pdf.rb +++ b/app/pdf/receipt_bill_pdf.rb @@ -54,8 +54,9 @@ class ReceiptBillPdf < Prawn::Document end items_account(item_price_by_accounts,printer_settings.precision,delimiter) + + sign(sale_data) - footer(printed_status) end @@ -409,6 +410,42 @@ class ReceiptBillPdf < Prawn::Document end end + def sign(sale_data) + SalePayment.where('sale_id = ?', sale_data.sale_id).each do |payment| + if payment.payment_method == "creditnote" + + y_position = cursor + stroke_horizontal_rule + + bounding_box([self.label_width,y_position], :width =>self.item_description_width) do + move_down 35 + stroke_horizontal_rule + end + + bounding_box([self.label_width,y_position], :width =>self.item_description_width) do + move_down 38 + text "Approved By" , :size => self.item_font_size,:align => :center + end + end + end + if sale_data.sale_status == "FOC" + + y_position = cursor + stroke_horizontal_rule + + bounding_box([self.label_width,y_position], :width =>self.item_description_width) do + move_down 35 + stroke_horizontal_rule + end + + bounding_box([0,y_position], :width =>self.item_width, :height => self.item_height) do + move_down 38 + text "Acknowledged By", :size => self.item_font_size,:align => :center + end + end + + end + def footer(printed_status) move_down 5 stroke_horizontal_rule From e4a2d58e5e5749a2b5d0c8ce291f6ab4462f4926 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 15 Aug 2017 15:14:55 +0630 Subject: [PATCH 15/15] update foc and pdf --- .../origami/payments_controller.rb | 29 ++++++++ app/controllers/origami/shifts_controller.rb | 2 - app/models/ability.rb | 8 +-- app/models/sale_payment.rb | 26 ++++++- app/models/shift_sale.rb | 3 +- app/pdf/close_cashier_pdf.rb | 8 +++ app/pdf/receipt_bill_pdf.rb | 23 +++--- app/views/origami/payments/show.html.erb | 72 ++++++++++++++----- .../origami/shifts/sale_summary.html.erb | 6 ++ config/routes.rb | 8 ++- 10 files changed, 146 insertions(+), 39 deletions(-) diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index 8c328030..109138a5 100644 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -163,6 +163,35 @@ class Origami::PaymentsController < BaseOrigamiController printer.print_receipt_bill(print_settings,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "Re-print") end + def foc + cash = params[:cash] + sale_id = params[:sale_id] + sub_total = params[:sub_total] + member_info = nil + rebate_amount = nil + + if(Sale.exists?(sale_id)) + saleObj = Sale.find(sale_id) + sale_payment = SalePayment.new + sale_payment.process_payment(saleObj, @user, cash, "foc") + + unique_code = "ReceiptBillPdf" + customer= Customer.find(saleObj.customer_id) + + #shop detail + shop_details = Shop.find(1) + + # get printer info + print_settings=PrintSetting.find_by_unique_code(unique_code) + # Calculate Food and Beverage Total + item_price_by_accounts = SaleItem.calculate_price_by_accounts(saleObj.sale_items) + discount_price_by_accounts = SaleItem.get_discount_price_by_accounts(saleObj.sale_items) + + printer = Printer::ReceiptPrinter.new(print_settings) + printer.print_receipt_bill(print_settings,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "FOC") + end + end + def rounding_adj saleObj = Sale.find(params[:sale_id]) diff --git a/app/controllers/origami/shifts_controller.rb b/app/controllers/origami/shifts_controller.rb index e134a594..31c68edf 100644 --- a/app/controllers/origami/shifts_controller.rb +++ b/app/controllers/origami/shifts_controller.rb @@ -66,8 +66,6 @@ class Origami::ShiftsController < BaseOrigamiController @sale_taxes = Sale.get_separate_tax(shift_obj,from=nil,to=nil,type='') #other payment details for mpu or visa like card @other_payment = ShiftSale.get_by_shift_other_payment(@shift) - #t details for mpu or visa like card - @other_payment = ShiftSale.get_by_shift_other_payment(@shift) # Calculate price_by_accounts @total_amount_by_account = ShiftSale.calculate_total_price_by_accounts(@shift,'amount') diff --git a/app/models/ability.rb b/app/models/ability.rb index 1938fb45..7b9ba1de 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -56,6 +56,8 @@ class Ability can :create, :payment can :reprint, :payment can :rounding_adj, :payment + can :foc, :payment + can :move_dining, :movetable can :moving, :movetable @@ -96,17 +98,13 @@ class Ability can :create, :payment can :reprint, :payment can :rounding_adj, :payment + can :foc, :payment can :move_dining, :movetable can :moving, :movetable can :move_dining, :moveroom - can :first_bill, :payment - can :show, :payment - can :create, :payment - can :reprint, :payment - can :manage, DiningQueue elsif user.role == "account" diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index ff2f6e2f..3435190d 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -46,6 +46,8 @@ class SalePayment < ApplicationRecord payment_status = giftcard_payment when "paypar" payment_status = paypar_payment + when "foc" + payment_status = foc_payment else puts "it was something else" end @@ -164,6 +166,17 @@ class SalePayment < ApplicationRecord return payment_status end + def foc_payment + payment_status = false + self.payment_method = "foc" + self.payment_amount = self.received_amount + self.outstanding_amount = self.sale.grand_total.to_f - self.received_amount.to_f + self.payment_status = "paid" + payment_method = self.save! + sale_update_payment_status(self.received_amount) + return payment_status + end + def creditnote_payment(customer_id) payment_status = false @@ -257,11 +270,15 @@ class SalePayment < ApplicationRecord all_received_amount = 0.0 sObj = Sale.find(self.sale_id) is_credit = 0 + is_foc = 0 sObj.sale_payments.each do |spay| all_received_amount += spay.payment_amount.to_f if spay.payment_method == "creditnote" is_credit = 1 end + if spay.payment_method == "foc" + is_foc = 1 + end end if (self.sale.grand_total <= all_received_amount) if is_credit == 0 @@ -269,9 +286,16 @@ class SalePayment < ApplicationRecord else self.sale.payment_status = "outstanding" end + + if is_foc == 0 + self.sale.payment_status = "paid" + else + self.sale.payment_status = "foc" + end + self.sale.sale_status = "completed" - if MembershipSetting.find_by_rebate(1) + if MembershipSetting.find_by_rebate(1) && is_foc == 0 response = rebat(sObj) if !response.nil? diff --git a/app/models/shift_sale.rb b/app/models/shift_sale.rb index 168e63ff..68c64cff 100644 --- a/app/models/shift_sale.rb +++ b/app/models/shift_sale.rb @@ -105,7 +105,8 @@ class ShiftSale < ApplicationRecord SUM(case when (sale_payments.payment_method='mpu') then (sale_payments.payment_amount) else 0 end) as mpu_amount, SUM(case when (sale_payments.payment_method='visa') then (sale_payments.payment_amount) else 0 end) as visa_amount, SUM(case when (sale_payments.payment_method='master') then (sale_payments.payment_amount) else 0 end) as master_amount, - SUM(case when (sale_payments.payment_method='jcb') then (sale_payments.payment_amount) else 0 end) as jcb_amount, + SUM(case when (sale_payments.payment_method='jcb') then (sale_payments.payment_amount) else 0 end) as jcb_amount, + SUM(case when (sale_payments.payment_method='foc') then (sale_payments.payment_amount) else 0 end) as foc_amount, SUM(case when (sale_payments.payment_method='paypar') then (sale_payments.payment_amount) else 0 end) as paypar_amount") .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") .where("sales.shift_sale_id =? and sale_status = 'completed' and sale_payments.payment_amount != 0 ", shift.id) diff --git a/app/pdf/close_cashier_pdf.rb b/app/pdf/close_cashier_pdf.rb index 51f905d6..73db5e9d 100644 --- a/app/pdf/close_cashier_pdf.rb +++ b/app/pdf/close_cashier_pdf.rb @@ -223,6 +223,14 @@ class CloseCashierPdf < Prawn::Document text "#{other.paypar_amount.round(2)}", :size => self.item_font_size, :align => :right end + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "FOC :", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "#{other.foc_amount.round(2)}", :size => self.item_font_size, :align => :right + end + end else diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb index 00ef0a7b..de18adc9 100644 --- a/app/pdf/receipt_bill_pdf.rb +++ b/app/pdf/receipt_bill_pdf.rb @@ -418,32 +418,33 @@ class ReceiptBillPdf < Prawn::Document stroke_horizontal_rule bounding_box([self.label_width,y_position], :width =>self.item_description_width) do - move_down 35 + move_down 70 stroke_horizontal_rule end bounding_box([self.label_width,y_position], :width =>self.item_description_width) do - move_down 38 + move_down 73 text "Approved By" , :size => self.item_font_size,:align => :center end end end - if sale_data.sale_status == "FOC" + if sale_data.payment_status == "foc" y_position = cursor stroke_horizontal_rule bounding_box([self.label_width,y_position], :width =>self.item_description_width) do - move_down 35 - stroke_horizontal_rule - end - - bounding_box([0,y_position], :width =>self.item_width, :height => self.item_height) do - move_down 38 - text "Acknowledged By", :size => self.item_font_size,:align => :center + move_down 70 + stroke_horizontal_rule + end + + bounding_box([self.label_width,y_position], :width =>self.item_description_width) do + move_down 73 + text "Acknowledged By" , :size => self.item_font_size,:align => :center end end + end def footer(printed_status) @@ -453,7 +454,7 @@ class ReceiptBillPdf < Prawn::Document y_position = cursor bounding_box([0, y_position], :width =>self.label_width, :height => self.item_height) do - text "#{printed_status}", :size => self.item_font_size,:align => :left + text "#{printed_status}",:style => :bold, :size => self.header_font_size,:align => :left end bounding_box([self.item_description_width,y_position], :width =>self.item_description_width, :height => self.item_height) do text "Thank You! See you Again", :left_margin => -10, :size => self.item_font_size,:align => :left diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index 83373b8e..68f843a7 100644 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -41,24 +41,24 @@ <% sub_total = 0 count = 0 %> - <% @sale_data.sale_items.each do |sale_item| + <% @sale_data.sale_items.each do |sale_item| count += 1 %> - <% sub_total += sale_item.price%> - + <% sub_total += sale_item.price%> + <%= count %> - - <%=sale_item.product_name%>@<%=sale_item.unit_price%> - - - <%=sale_item.qty%> - - - <%=(sale_item.price)%> - - - <%end %> + + <%=sale_item.product_name%>@<%=sale_item.unit_price%> + + + <%=sale_item.qty%> + + + <%=(sale_item.price)%> + + + <%end %>
    @@ -75,7 +75,7 @@ <%else%> (Discount) <%end%> - + (<%=@sale_data.total_discount rescue 0%>) @@ -258,7 +258,7 @@ - +
    @@ -443,4 +443,44 @@ function update_balance(){ $('#balance').text(result.toFixed(2)); } +$('#foc').click(function() { + + $( "#loading_wrapper" ).show(); + // payment + var cash = $('#amount_due').text(); + var sub_total = $('#sub-total').text(); + var sale_id = $('#sale_id').text(); + var params = { 'cash':cash,'sale_id':sale_id,'sub_total':sub_total }; + $.ajax({type: "POST", + url: "<%= origami_payment_foc_path %>", + data: params, + success:function(result){ + localStorage.removeItem("cash"); + if (result.status) { + var msg = result.message; + } + else{ + var msg = ''; + } + $( "#loading_wrapper" ).hide(); + + $.confirm({ + title: 'Infomation!', + content: 'Thank you !', + buttons: { + confirm: { + text: 'Ok', + btnClass: 'btn-green', + action: function(){ + window.location.href = '/origami'; + } + } + } + }); + + } + }); + + }); + \ No newline at end of file diff --git a/app/views/origami/shifts/sale_summary.html.erb b/app/views/origami/shifts/sale_summary.html.erb index 94e59924..ad9631a0 100644 --- a/app/views/origami/shifts/sale_summary.html.erb +++ b/app/views/origami/shifts/sale_summary.html.erb @@ -153,6 +153,12 @@ <%=other.paypar_amount.round(2) rescue 0.0 %> <% @total_amount = @total_amount+other.paypar_amount rescue 0.0 %> + + + FOC + <%=other.foc_amount.round(2) rescue 0.0 %> + <% @total_amount = @total_amount+other.foc_amount rescue 0.0 %> + <%end%> diff --git a/config/routes.rb b/config/routes.rb index bebb89bf..4286303d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,9 +2,6 @@ require 'sidekiq/web' Rails.application.routes.draw do - namespace :settings do - resources :item_sets - end root 'home#index' mount Sidekiq::Web => '/kiq' @@ -133,6 +130,7 @@ Rails.application.routes.draw do get 'sale/:sale_id/first_bill' => 'payments#first_bill', :defaults => { :format => 'json' } get 'sale/:sale_id/payment' => 'payments#show' + post 'payment/foc' => 'payments#foc', :defaults => { :format => 'json' } post 'payment/cash' => 'payments#create' post 'payment/mpu' => "mpu#create" post 'payment/jcb' => "jcb#create" @@ -219,6 +217,10 @@ Rails.application.routes.draw do resources :menu_categories, only: [:new, :create, :edit,:delete] end + resources :item_sets + + resources :menu_item_sets + #accounts resources :accounts