diff --git a/app/controllers/api/restaurant/item_sets_controller.rb b/app/controllers/api/restaurant/item_sets_controller.rb new file mode 100644 index 00000000..a7ad9efc --- /dev/null +++ b/app/controllers/api/restaurant/item_sets_controller.rb @@ -0,0 +1,9 @@ +class Api::Restaurant::ItemSetsController < Api::ApiController + + #Description + # Pull the default menu details and also other available (active) menus + # Input Params - order_id + def index + @item_sets = ItemSet.all + end +end diff --git a/app/controllers/api/restaurant/menu_controller.rb b/app/controllers/api/restaurant/menu_controller.rb index 169cc1fd..b45e1189 100644 --- a/app/controllers/api/restaurant/menu_controller.rb +++ b/app/controllers/api/restaurant/menu_controller.rb @@ -5,8 +5,7 @@ class Api::Restaurant::MenuController < Api::ApiController # Input Params - order_id def index @menus = Menu.all - @current_menu = Menu.current_menu - + # @current_menu = Menu.current_menu end #Description diff --git a/app/controllers/api/restaurant/menu_item_attributes_controller.rb b/app/controllers/api/restaurant/menu_item_attributes_controller.rb index f2aead8f..1b6a48d4 100644 --- a/app/controllers/api/restaurant/menu_item_attributes_controller.rb +++ b/app/controllers/api/restaurant/menu_item_attributes_controller.rb @@ -6,8 +6,4 @@ class Api::Restaurant::MenuItemAttributesController < Api::ApiController def index @menu_attributes = MenuItemAttribute.all end - - - - end diff --git a/app/controllers/api/restaurant/menu_item_options_controller.rb b/app/controllers/api/restaurant/menu_item_options_controller.rb index cc898add..16bd2f90 100644 --- a/app/controllers/api/restaurant/menu_item_options_controller.rb +++ b/app/controllers/api/restaurant/menu_item_options_controller.rb @@ -1,13 +1,8 @@ class Api::Restaurant::MenuItemOptionsController < Api::ApiController - #Description # Pull the default menu details and also other available (active) menus # Input Params - order_id def index @menu_options = MenuItemOption.all end - - - - end diff --git a/app/controllers/concerns/token_verification.rb b/app/controllers/concerns/token_verification.rb index 0cc6c263..66658b6a 100644 --- a/app/controllers/concerns/token_verification.rb +++ b/app/controllers/concerns/token_verification.rb @@ -14,10 +14,9 @@ module TokenVerification end def authenticate_token - authenticate_with_http_token do |token, options| + authenticate_with_http_token do |token, options| #@current_user = User.find_by(api_key: token) Rails.logger.debug "token - " + token.to_s - @user = Employee.authenticate_by_token(token) if @user return true diff --git a/app/controllers/settings/dining_charges_controller.rb b/app/controllers/settings/dining_charges_controller.rb index 31763b02..854354c2 100644 --- a/app/controllers/settings/dining_charges_controller.rb +++ b/app/controllers/settings/dining_charges_controller.rb @@ -97,6 +97,6 @@ class Settings::DiningChargesController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def dining_charge_params # params.fetch(:dining_charge, {}) - params.require(:dining_charge).permit(:item_code, :unit_price, :taxable, :charge_type,:minimum_free_time ,:charge_block,:time_rounding,:time_rounding_block, :zone_id) + params.require(:dining_charge).permit(:item_code, :unit_price, :taxable, :charge_type,:minimum_free_time ,:charge_block,:time_rounding,:time_rounding_block, :zone_id, :time_rounding_block_price) end end diff --git a/app/controllers/settings/item_sets_controller.rb b/app/controllers/settings/item_sets_controller.rb index 5564ed98..cbd74edb 100644 --- a/app/controllers/settings/item_sets_controller.rb +++ b/app/controllers/settings/item_sets_controller.rb @@ -69,6 +69,6 @@ class Settings::ItemSetsController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def settings_item_set_params - params.require(:item_set).permit(:name, :min_selectable_qty, :max_selectable_qty) + params.require(:item_set).permit(:name, :alt_name, :min_selectable_qty, :max_selectable_qty) end end diff --git a/app/controllers/settings/menu_categories_controller.rb b/app/controllers/settings/menu_categories_controller.rb index 8ca9cfb4..a15cca20 100644 --- a/app/controllers/settings/menu_categories_controller.rb +++ b/app/controllers/settings/menu_categories_controller.rb @@ -89,6 +89,6 @@ class Settings::MenuCategoriesController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def settings_menu_category_params - params.require(:menu_category).permit(:code, :menu_id, :name, :alt_name, :order_by, :menu_category_id) + params.require(:menu_category).permit(:code, :menu_id, :name, :alt_name, :order_by, :menu_category_id, :is_available) end end diff --git a/app/controllers/settings/menu_item_options_controller.rb b/app/controllers/settings/menu_item_options_controller.rb index 41679796..f74b0689 100644 --- a/app/controllers/settings/menu_item_options_controller.rb +++ b/app/controllers/settings/menu_item_options_controller.rb @@ -70,6 +70,6 @@ class Settings::MenuItemOptionsController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def settings_menu_item_option_params - params.require(:menu_item_option).permit(:name, :value) + params.require(:menu_item_option).permit(:option_type, :name, :value) end end diff --git a/app/controllers/settings/products_controller.rb b/app/controllers/settings/products_controller.rb new file mode 100644 index 00000000..0c2fa15d --- /dev/null +++ b/app/controllers/settings/products_controller.rb @@ -0,0 +1,76 @@ +class Settings::ProductsController < ApplicationController + before_action :set_settings_product, only: [:show, :edit, :update, :destroy] + + # GET /settings/products + # GET /settings/products.json + def index + @settings_products = Product.all + end + + # GET /settings/products/1 + # GET /settings/products/1.json + def show + end + + # GET /settings/products/new + def new + @settings_product = Product.new + end + + # GET /settings/products/1/edit + def edit + end + + # POST /settings/products + # POST /settings/products.json + def create + + @settings_product = Product.new(settings_product_params) + @settings_product.created_by = current_user.name + respond_to do |format| + if @settings_product.save + format.html { redirect_to settings_products_path, notice: 'Product was successfully created.' } + format.json { render :show, status: :created, location: @settings_product } + else + format.html { render :new } + format.json { render json: @settings_product.errors, status: :unprocessable_entity } + end + end + end + + # PATCH/PUT /settings/products/1 + # PATCH/PUT /settings/products/1.json + def update + respond_to do |format| + if @settings_product.update(settings_product_params) + format.html { redirect_to settings_product_path, notice: 'Product was successfully updated.' } + format.json { render :show, status: :ok, location: @settings_product } + else + format.html { render :edit } + format.json { render json: @settings_product.errors, status: :unprocessable_entity } + end + end + end + + # DELETE /settings/products/1 + # DELETE /settings/products/1.json + def destroy + @settings_product.destroy + respond_to do |format| + format.html { redirect_to settings_products_path, notice: 'Product was successfully destroyed.' } + format.json { head :no_content } + end + end + + private + # Use callbacks to share common setup or constraints between actions. + def set_settings_product + @settings_product = Product.find(params[:id]) + end + + # Never trust parameters from the scary internet, only allow the white list through. + def settings_product_params + params.require(:product).permit(:item_code, :name, :alt_name, :unit_price, :image_path, :description, :information, :taxable,:created_by) + end + +end diff --git a/app/controllers/settings/promotions_controller.rb b/app/controllers/settings/promotions_controller.rb new file mode 100644 index 00000000..277cf62d --- /dev/null +++ b/app/controllers/settings/promotions_controller.rb @@ -0,0 +1,76 @@ +class Settings::PromotionsController < ApplicationController + before_action :set_promotion, only: [:show, :edit, :update, :destroy] + + # GET /promotions + # GET /promotions.json + def index + @promotions = Promotion.all + end + + # GET /promotions/1 + # GET /promotions/1.json + def show + end + + # GET /promotions/new + def new + @promotion = Promotion.new + @promotion.promo_start_date = DateTime.now + @promotion.promo_end_date = DateTime.now + end + + # GET /promotions/1/edit + def edit + end + + # POST /promotions + # POST /promotions.json + def create + @promotion = Promotion.new(promotion_params) + @promotion.created_by = current_login_employee.id + respond_to do |format| + if @promotion.save + format.html { redirect_to settings_promotions_path, notice: 'Promotion was successfully created.' } + format.json { render :show, status: :created, location: @promotion } + else + format.html { render :new } + format.json { render json: @promotion.errors, status: :unprocessable_entity } + end + end + end + + # PATCH/PUT /promotions/1 + # PATCH/PUT /promotions/1.json + def update + respond_to do |format| + if @promotion.update(promotion_params) + format.html { redirect_to settings_promotions_path, notice: 'Promotion was successfully updated.' } + format.json { render :show, status: :ok, location: @promotion } + else + format.html { render :edit } + format.json { render json: @promotion.errors, status: :unprocessable_entity } + end + end + end + + # DELETE /promotions/1 + # DELETE /promotions/1.json + def destroy + @promotion.destroy + respond_to do |format| + format.html { redirect_to settings_promotions_path, notice: 'Promotion was successfully destroyed.' } + format.json { head :no_content } + end + end + + private + # Use callbacks to share common setup or constraints between actions. + def set_promotion + @promotion = Promotion.find(params[:id]) + end + + # Never trust parameters from the scary internet, only allow the white list through. + def promotion_params + params.require(:promotion).permit(:promo_code, :promo_start_date, :promo_end_date, :promo_start_hour,:promo_end_hour ,:promo_day, :promo_type,:original_product ,:min_qty ,:created_by) + end +end diff --git a/app/controllers/settings/set_menu_items_controller.rb b/app/controllers/settings/set_menu_items_controller.rb index 64b9c945..60fa3b7d 100644 --- a/app/controllers/settings/set_menu_items_controller.rb +++ b/app/controllers/settings/set_menu_items_controller.rb @@ -12,7 +12,7 @@ class Settings::SetMenuItemsController < ApplicationController # GET /settings/menu_items/1 # GET /settings/menu_items/1.json def show - @sub_menu = MenuItem.where("menu_item_id=?",params[:id]).page(params[:page]).per(10) + # @sub_menu = MenuItem.where("menu_item_id=?",params[:id]).page(params[:page]).per(10) @menu_item_instance = MenuItemInstance.where("menu_item_id=?",params[:id]).page(params[:page]).per(10) end diff --git a/app/controllers/settings/simple_menu_items_controller.rb b/app/controllers/settings/simple_menu_items_controller.rb index 9d3ac5ed..60949618 100644 --- a/app/controllers/settings/simple_menu_items_controller.rb +++ b/app/controllers/settings/simple_menu_items_controller.rb @@ -12,7 +12,7 @@ class Settings::SimpleMenuItemsController < ApplicationController # GET /settings/menu_items/1 # GET /settings/menu_items/1.json def show - @sub_menu = MenuItem.where("menu_item_id=?",params[:id]).page(params[:page]).per(10) + # @sub_menu = MenuItem.where("menu_item_id=?",params[:id]).page(params[:page]).per(10) @menu_item_instance = MenuItemInstance.where("menu_item_id=?",params[:id]).page(params[:page]).per(10) end diff --git a/app/helpers/settings/promotions_helper.rb b/app/helpers/settings/promotions_helper.rb new file mode 100644 index 00000000..787c2194 --- /dev/null +++ b/app/helpers/settings/promotions_helper.rb @@ -0,0 +1,2 @@ +module Settings::PromotionsHelper +end diff --git a/app/models/employee.rb b/app/models/employee.rb index 7693c448..85aeaec1 100644 --- a/app/models/employee.rb +++ b/app/models/employee.rb @@ -35,7 +35,6 @@ class Employee < ApplicationRecord end def self.authenticate_by_token(session_token) - if (session_token) user = Employee.find_by_token_session(session_token) if user && user.session_expiry.utc > DateTime.now.utc diff --git a/app/models/menu_item_option.rb b/app/models/menu_item_option.rb index fdf2d137..fffdf210 100644 --- a/app/models/menu_item_option.rb +++ b/app/models/menu_item_option.rb @@ -1,4 +1,3 @@ class MenuItemOption < ApplicationRecord validates_presence_of :name, :value - end diff --git a/app/models/product.rb b/app/models/product.rb new file mode 100644 index 00000000..042e1730 --- /dev/null +++ b/app/models/product.rb @@ -0,0 +1,3 @@ +class Product < ApplicationRecord + validates_presence_of :name +end diff --git a/app/models/promotion.rb b/app/models/promotion.rb new file mode 100644 index 00000000..9b5c4c12 --- /dev/null +++ b/app/models/promotion.rb @@ -0,0 +1,2 @@ +class Promotion < ApplicationRecord +end diff --git a/app/models/shop.rb b/app/models/shop.rb index 1cf1119c..dbb0930e 100644 --- a/app/models/shop.rb +++ b/app/models/shop.rb @@ -1,2 +1,116 @@ class Shop < ApplicationRecord + + def promo_activate + current_day = Time.now.strftime("%Y-%d-%m") + current_time = Time.now.strftime('%H:%M') + day = Date.today.wday + promoList = is_between_promo_datetime(current_day,current_time) + if promoList.size > 0 + itemList = combine_item(saleObj) + is_promo_day(promoList,day, itemList) + end + end + + def is_between_promo_datetime(current_day,current_time) + promoList = Promotion.where('( promo_start_date < ? AND promo_end_date > ?) AND (promo_start_time < ? AND promo_end_time > ?)', current_day, current_day, current_time, current_time) + return promoList + end + + def combine_item(saleObj) + itemList = saleObj.sale_items.group(:product_code).sum(:qty) + end + + def is_promo_day(promoList, day, orderitemList) + promoList.each do |promo| + dayresult = promo.promo_day.include?(day) + if dayresult + orderitemList.each do |item| + find_promo_item(promo, item) + end + end + end + end + + def find_promo_item(promo, orderitem) + if promo.prouduct_item == orderitem + if promo.minmum_qty < orderitem.qty + return false + else + same, promo_item_code = check_giveaway_product(promo, orderitem) + if same + give_promotion_same_product + else + find_promo_item_in_orderlist + end + end + end + end + + def check_giveaway_product(promo, orderitem) + promo.promotion_products.each do |promo_product| + if promo_product.item_code == orderitem.item_code + return true, promo_product.item_code + else + return false, promo_product.item_code + end + end + end + + def self.give_promotion_same_product(qty, promoqty, foc_min_qty) + multiple = qty / promoqty # loop count + charge_qty = 0 + foc_qty = 0 + if multiple > 0 + multiple.times.each do |key| + if qty >= promoqty + charge_qty += promoqty + different = qty - promoqty + qty = different + if different == 0 + Shop.add_promotion_item + foc_qty += foc_min_qty + else + foc_qty += foc_min_qty + qty = qty - foc_min_qty + end + else + if multiple == foc_qty + charge_qty += qty + else + charge_qty += qty + end + end + end + else + charge_qty = qty + end + puts "Charged - " + charge_qty.to_s + puts "FOC - " + foc_qty.to_s + end + + def find_promo_item_in_orderlist(promo_item_code, orderitemList) + orderitemList.each do |item| + if item.item_code == promo_item_code + give_promotion_second_product(item) + else + add_promotion_second_item + end + end + end + + def give_promotion_second_product(item, foc_min_qty) + if item.qty > foc_min_qty + + else + + end + end + + def self.add_promotion_item + + end + + def self.add_promotion_second_item + + end end diff --git a/app/views/api/restaurant/item_sets/index.json.jbuilder b/app/views/api/restaurant/item_sets/index.json.jbuilder new file mode 100644 index 00000000..73ebeb12 --- /dev/null +++ b/app/views/api/restaurant/item_sets/index.json.jbuilder @@ -0,0 +1,7 @@ +json.array! @item_sets do |set| + json.id set.id + json.name set.name + json.alt_name set.alt_name + json.min_selectable_qty set.min_selectable_qty + json.max_selectable_qty set.max_selectable_qty +end diff --git a/app/views/api/restaurant/menu/_menu.json.jbuilder b/app/views/api/restaurant/menu/_menu.json.jbuilder index 43721ff0..cfa950d7 100644 --- a/app/views/api/restaurant/menu/_menu.json.jbuilder +++ b/app/views/api/restaurant/menu/_menu.json.jbuilder @@ -5,13 +5,14 @@ json.valid_time_from menu.valid_time_from.strftime("%H:%M") json.valid_time_to menu.valid_time_to.strftime("%H:%M") if (menu.menu_categories) - json.menu_categories menu.menu_categories do |category| + json.categories menu.menu_categories do |category| json.id category.id json.name category.name json.alt_name category.alt_name + json.is_available category.is_available if category.menu_items - json.menu_items category.menu_items do |item| + json.items category.menu_items do |item| json.partial! 'api/restaurant/menu/menu_item', item: item end end diff --git a/app/views/api/restaurant/menu/_menu_item.json.jbuilder b/app/views/api/restaurant/menu/_menu_item.json.jbuilder index d86624b5..ffad3dc2 100644 --- a/app/views/api/restaurant/menu/_menu_item.json.jbuilder +++ b/app/views/api/restaurant/menu/_menu_item.json.jbuilder @@ -1,40 +1,47 @@ #Menu Item Information -json.item_code item.item_code -json.name item.name -json.alt_name item.alt_name -json.type item.type -json.min_qty item.min_qty -json.min_selectable_item item.min_selectable_item -json.max_selectable_item item.max_selectable_item +json.id item.id +json.item_code item.item_code +json.name item.name +json.alt_name item.alt_name +json.image item.image_path.url +json.description item.description +json.Information item.information +json.type item.type +json.account_id item.account_id +json.min_qty item.min_qty +json.is_available item.is_available +json.is_sub_item item.is_sub_item +json.attributes item.item_attributes +json.options item.item_options +# json.min_selectable_item item.min_selectable_item +# json.max_selectable_item item.max_selectable_item #Item instance -if item.menu_item_instances.count == 1 then +# if item.menu_item_instances.count == 1 then +# item_instance = item.menu_item_instances[0] +# json.price = item_instance.price +# json.is_available = item_instance.is_available +# json.is_on_promotion = item_instance.is_on_promotion +# json.promotion_price = item_instance.promotion_price +# json.item_attributes = item_instance.item_attributes - item_instance = item.menu_item_instances[0] - json.price = item_instance.price - json.is_available = item_instance.is_available - json.is_on_promotion = item_instance.is_on_promotion - json.promotion_price = item_instance.promotion_price - json.item_attributes = item_instance.item_attributes - -elsif item.menu_item_instances.count > 1 then - - json.item_instances item.menu_item_instances do |is| - json.item_instance_item_code = is.item_instance_code - json.item_instance_name = is.item_instance_name +# elsif item.menu_item_instances.count > 1 then + json.instances item.menu_item_instances do |is| + json.code = is.item_instance_code + json.name = is.item_instance_name json.price = is.price json.is_available = is.is_available json.is_on_promotion = is.is_on_promotion json.promotion_price = is.promotion_price json.item_attributes = is.item_attributes - end + # end end + #Child Menu items -if (item.menu_item_sets) then - json.set_items item.menu_item_sets.each do |item| - json.partial! 'api/restaurant/menu/menu_item', item: item - end - -end +# if (item.children) then +# json.set_items item.children.each do |item| +# json.partial! 'api/restaurant/menu/menu_item', item: item +# end +# end \ No newline at end of file diff --git a/app/views/api/restaurant/menu/index.json.jbuilder b/app/views/api/restaurant/menu/index.json.jbuilder index b4241854..55e876f6 100644 --- a/app/views/api/restaurant/menu/index.json.jbuilder +++ b/app/views/api/restaurant/menu/index.json.jbuilder @@ -4,9 +4,11 @@ json.array! @menus do |menu| json.valid_days menu.valid_days json.valid_time_from menu.valid_time_from.strftime("%H:%M") json.valid_time_to menu.valid_time_to.strftime("%H:%M") - if (@current_menu) - json.current_menu do - json.partial! 'api/restaurant/menu/menu', menu: @current_menu - end - end + + json.partial! 'api/restaurant/menu/menu', menu: menu + # if (@current_menu) + # json.current_menu do + # json.partial! 'api/restaurant/menu/menu', menu: @current_menu + # end + # end end diff --git a/app/views/api/restaurant/menu_item_attributes/index.json.jbuilder b/app/views/api/restaurant/menu_item_attributes/index.json.jbuilder index 0dc729eb..4a265fb6 100644 --- a/app/views/api/restaurant/menu_item_attributes/index.json.jbuilder +++ b/app/views/api/restaurant/menu_item_attributes/index.json.jbuilder @@ -1,4 +1,5 @@ json.array! @menu_attributes do |attribute| + json.id attribute.id json.type attribute.attribute_type json.name attribute.name json.value attribute.value diff --git a/app/views/api/restaurant/menu_item_options/index.json.jbuilder b/app/views/api/restaurant/menu_item_options/index.json.jbuilder index eae1c761..c7ce21aa 100644 --- a/app/views/api/restaurant/menu_item_options/index.json.jbuilder +++ b/app/views/api/restaurant/menu_item_options/index.json.jbuilder @@ -1,4 +1,6 @@ json.array! @menu_options do |option| + json.id option.id + json.type option.option_type json.name option.name json.value option.value end diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 3a25b101..0daa8f5f 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -30,6 +30,9 @@
| Type | Name | Value | |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| <%= settings_menu_item_option.option_type %> | <%= link_to settings_menu_item_option.name, settings_menu_item_option_path(settings_menu_item_option) %> | <%= settings_menu_item_option.value %> | <%= link_to 'Edit', edit_settings_menu_item_option_path(settings_menu_item_option) %>
diff --git a/app/views/settings/menu_item_options/show.html.erb b/app/views/settings/menu_item_options/show.html.erb
index 611f3165..413de12d 100644
--- a/app/views/settings/menu_item_options/show.html.erb
+++ b/app/views/settings/menu_item_options/show.html.erb
@@ -13,6 +13,7 @@
+
+
+
diff --git a/app/views/settings/products/show.html.erb b/app/views/settings/products/show.html.erb
new file mode 100644
index 00000000..f16b5426
--- /dev/null
+++ b/app/views/settings/products/show.html.erb
@@ -0,0 +1,33 @@
+
+
+
+ <%= render 'form', settings_product: @settings_product %>
+
+
+
+
+
+
+
diff --git a/app/views/settings/products/show.json.jbuilder b/app/views/settings/products/show.json.jbuilder
new file mode 100644
index 00000000..aef1705d
--- /dev/null
+++ b/app/views/settings/products/show.json.jbuilder
@@ -0,0 +1 @@
+json.partial! "settings_products/settings_product", settings_product: @settings_product
diff --git a/app/views/settings/promotions/_form.html.erb b/app/views/settings/promotions/_form.html.erb
new file mode 100644
index 00000000..98dbb7fe
--- /dev/null
+++ b/app/views/settings/promotions/_form.html.erb
@@ -0,0 +1,48 @@
+<%= simple_form_for([:settings,@promotion]) do |f| %>
+ <%= f.error_notification %>
+
+
+
+Product+
+
+
+
+
+
+
+ <%= f.input :promo_code %>
+
+
+
+
+ Promo Start Date
+ <%= f.date_field :promo_start_date, :placeholder => "From Date" , :class => "form-control"%>
+
+ +
+ Promo End Date
+ <%= f.date_field :promo_end_date ,:placeholder => "To Date" , :class => "form-control"%>
+
+
+
+
+ <%= f.input :promo_start_hour %>
+
+
+ <%= f.input :promo_end_hour %>
+
+
+ <%= f.input :promo_day %>
+
+
+
+ <%= f.input :promo_type,input_html: { class: "" },
+ collection: %w{Quantity Net_off Net_price Percentage},:class => 'form-control' ,:label => "" %>
+
+
+
+ <%= f.input :original_product,collection: MenuItem.order("name desc"),input_html: { selected: 2 } %>
+ <%= f.input :min_qty %>
+
+ <%= f.button :submit %>
+
+<% end %>
diff --git a/app/views/settings/promotions/_promotion.json.jbuilder b/app/views/settings/promotions/_promotion.json.jbuilder
new file mode 100644
index 00000000..d9b08aef
--- /dev/null
+++ b/app/views/settings/promotions/_promotion.json.jbuilder
@@ -0,0 +1,2 @@
+json.extract! promotion, :id, :created_at, :updated_at
+json.url promotion_url(promotion, format: :json)
diff --git a/app/views/settings/promotions/edit.html.erb b/app/views/settings/promotions/edit.html.erb
new file mode 100644
index 00000000..47a01b80
--- /dev/null
+++ b/app/views/settings/promotions/edit.html.erb
@@ -0,0 +1,10 @@
+
+
diff --git a/app/views/settings/promotions/index.html.erb b/app/views/settings/promotions/index.html.erb
new file mode 100644
index 00000000..606b138b
--- /dev/null
+++ b/app/views/settings/promotions/index.html.erb
@@ -0,0 +1,58 @@
+
+
+
+ <%= render 'form', promotion: @promotion %>
+<%= notice %> + + +
+
+
+
++
+
diff --git a/app/views/settings/promotions/index.json.jbuilder b/app/views/settings/promotions/index.json.jbuilder
new file mode 100644
index 00000000..1c9c5f97
--- /dev/null
+++ b/app/views/settings/promotions/index.json.jbuilder
@@ -0,0 +1 @@
+json.array! @promotions, partial: 'promotions/promotion', as: :promotion
diff --git a/app/views/settings/promotions/new.html.erb b/app/views/settings/promotions/new.html.erb
new file mode 100644
index 00000000..c7748bb6
--- /dev/null
+++ b/app/views/settings/promotions/new.html.erb
@@ -0,0 +1,17 @@
+
+
+
+
diff --git a/app/views/settings/promotions/show.html.erb b/app/views/settings/promotions/show.html.erb
new file mode 100644
index 00000000..4dd7e593
--- /dev/null
+++ b/app/views/settings/promotions/show.html.erb
@@ -0,0 +1,4 @@
+
+
+
+ <%= render 'form', promotion: @promotion %>
+<%= notice %> + +<%= link_to 'Edit', edit_promotion_path(@promotion) %> | +<%= link_to 'Back', promotions_path %> diff --git a/app/views/settings/promotions/show.json.jbuilder b/app/views/settings/promotions/show.json.jbuilder new file mode 100644 index 00000000..52507108 --- /dev/null +++ b/app/views/settings/promotions/show.json.jbuilder @@ -0,0 +1 @@ +json.partial! "promotions/promotion", promotion: @promotion diff --git a/app/views/settings/set_menu_items/show.html.erb b/app/views/settings/set_menu_items/show.html.erb index a5762fc3..6cec8cab 100644 --- a/app/views/settings/set_menu_items/show.html.erb +++ b/app/views/settings/set_menu_items/show.html.erb @@ -21,10 +21,7 @@Type |
Account Type |
Menu category |
- Menu item |
Min qty |
- Min selectable item |
- Max selectable item |
Created At |
Action |
<%= @settings_menu_item.type %> |
<%= @settings_menu_item.account.title %> |
<%= @settings_menu_item.menu_category_id %> |
- <%= @settings_menu_item.menu_item_id %> |
<%= @settings_menu_item.min_qty %> |
- <%= @settings_menu_item.min_selectable_item %> |
- <%= @settings_menu_item.max_selectable_item %> |
<%= @settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %> |
<%= link_to 'Edit', edit_settings_menu_category_set_menu_item_path(@category, @settings_menu_item) %> |
@@ -51,58 +45,7 @@
-<% if @sub_menu.count > 0 %>
-
-
-
- <%= paginate @sub_menu, param_name: :page, :outer_window => 3 %>
-
-<% end %>
-
-
-Sub Menu Items-
Menu Item Instances
diff --git a/app/views/settings/simple_menu_items/show.html.erb b/app/views/settings/simple_menu_items/show.html.erb
index 9bfae1b0..d9961c92 100644
--- a/app/views/settings/simple_menu_items/show.html.erb
+++ b/app/views/settings/simple_menu_items/show.html.erb
@@ -23,10 +23,10 @@
| ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| Item code | -Name | -Alt name | -Type | -Parent Item | -Created by | -Created at | - -- | |||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| <%= settings_menu_item.item_code %> | -<%= settings_menu_item.name %> | -<%= settings_menu_item.alt_name %> | -<%= settings_menu_item.type %> | -<%= settings_menu_item.parent.name rescue "-" %> | -<%= settings_menu_item.created_by %> | - -<%= settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %> | - - - <% if settings_menu_item.type == "SimpleMenuItem" %> -<%= link_to 'Show', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ) %> | -<%= link_to 'Edit', edit_settings_menu_category_simple_menu_item_path(@category, settings_menu_item) %> | -<%= link_to 'Destroy', settings_menu_category_simple_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %> | - <% else %> -<%= link_to 'Show', settings_menu_category_set_menu_item_path(@category, settings_menu_item ) %> | -<%= link_to 'Edit', edit_settings_menu_category_set_menu_item_path(@category, settings_menu_item) %> | -<%= link_to 'Destroy', settings_menu_category_set_menu_item_path(@category, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %> | - <% end %> -