merge with august_spring

2017-08-15 17:04:28 +06:30
parent 513530e8f3 74b15465f7
commit 20bba0f659
30 changed files with 1089 additions and 1270 deletions
--- a/app/controllers/origami/sale_edit_controller.rb
+++ b/app/controllers/origami/sale_edit_controller.rb
@@ -1,31 +1,50 @@
 class Origami::SaleEditController < BaseOrigamiController
  authorize_resource :class => false
-   # Index for sale item void OR edit
-   def edit
-     sale_id = params[:sale_id]
-     @table_id = params[:table_id]
-     @saleobj = Sale.find(sale_id)
-   end
+  # Index for sale item void OR edit
+  def edit
+    sale_id = params[:sale_id]
+    @table_id = params[:table_id]
+    @saleobj = Sale.find(sale_id)
+  end

-   # create item void. make duplicate old record and update qty and price
-   def item_void
-     saleitemId = params[:sale_item_id]
-     saleitemObj = SaleItem.find(saleitemId)
-     saleitemObj.remark = 'void'
-     saleitemObj.save
-     @newsaleitem = SaleItem.new
-     @newsaleitem = saleitemObj.dup
-     @newsaleitem.save
-     @newsaleitem.qty = saleitemObj.qty * -1
-     @newsaleitem.price = saleitemObj.price * -1
-     @newsaleitem.is_taxable = 1
-     @newsaleitem.product_name = saleitemObj.product_name + " - void"
-     @newsaleitem.save
+  # create item void. make duplicate old record and update qty and price
+  def item_void
+    saleitemId = params[:sale_item_id]
+    saleitemObj = SaleItem.find(saleitemId)
+    saleitemObj.remark = 'void'
+    saleitemObj.save
+    @newsaleitem = SaleItem.new
+    @newsaleitem = saleitemObj.dup
+    @newsaleitem.save
+    @newsaleitem.qty = saleitemObj.qty * -1
+    @newsaleitem.price = saleitemObj.price * -1
+    @newsaleitem.is_taxable = 1
+    @newsaleitem.product_name = saleitemObj.product_name + " - void"
+    @newsaleitem.save

-     # re-calc tax
-     saleObj =  Sale.find(saleitemObj.sale_id)
-     saleObj.compute_without_void
-   end
+    # re-calc tax
+    saleObj = Sale.find(saleitemObj.sale_id)
+    saleObj.compute_without_void
+  end
+
+  def item_foc
+    saleitemId = params[:sale_item_id]
+    saleitemObj = SaleItem.find(saleitemId)
+    saleitemObj.remark = 'foc'
+    saleitemObj.save
+    @newsaleitem = SaleItem.new
+    @newsaleitem = saleitemObj.dup
+    @newsaleitem.save
+    @newsaleitem.qty = saleitemObj.qty * -1
+    @newsaleitem.price = saleitemObj.price * -1
+    @newsaleitem.is_taxable = 1
+    @newsaleitem.product_name = saleitemObj.product_name + ' foc'
+    @newsaleitem.save
+
+    # re-calc tax
+    saleObj = Sale.find(saleitemObj.sale_id)
+    saleObj.compute_without_void
+  end

  # def item_edit
  #   saleitemId = params[:sale_item_id]
@@ -48,63 +67,63 @@ class Origami::SaleEditController < BaseOrigamiController
  # end

  def item_edit
-    saleitemId   = params[:sale_item_id]
-    update_qty   = params[:update_qty]
+    saleitemId = params[:sale_item_id]
+    update_qty = params[:update_qty]
    update_price = params[:update_price]
-    saleitemObj  = SaleItem.find(saleitemId)
+    saleitemObj = SaleItem.find(saleitemId)

-    saleitemObj.qty           = update_qty
-    saleitemObj.price         = update_qty.to_f * update_price.to_f
-    saleitemObj.unit_price    = update_price
+    saleitemObj.qty = update_qty
+    saleitemObj.price = update_qty.to_f * update_price.to_f
+    saleitemObj.unit_price = update_price
    saleitemObj.taxable_price = update_qty.to_f * update_price.to_f
    # saleitemObj.remark        = 'edit'
-    saleitemObj.product_name  = saleitemObj.product_name + " - updated"
+    saleitemObj.product_name = saleitemObj.product_name + " - updated"
    saleitemObj.save

-     # re-calc tax
-     saleObj =  Sale.find(saleitemObj.sale_id)
-     saleObj.compute_without_void
+    # re-calc tax
+    saleObj = Sale.find(saleitemObj.sale_id)
+    saleObj.compute_without_void
  end


-   # make cancel void item
-   def item_void_cancel
-     saleitemId = params[:sale_item_id]
-     saleitemObj = SaleItem.find(saleitemId)
-     both = SaleItem.where('product_code=?',saleitemObj.product_code)
-     both.each do |item|
-       if item.qty.to_i > 0
-         item.remark = nil
-         item.save
-       end
-     end
-     saleitemObj.destroy
+  # make cancel void item
+  def item_void_cancel
+    saleitemId = params[:sale_item_id]
+    saleitemObj = SaleItem.find(saleitemId)
+    both = SaleItem.where('product_code=?', saleitemObj.product_code)
+    both.each do |item|
+      if item.qty.to_i > 0
+        item.remark = nil
+        item.save
+      end
+    end
+    saleitemObj.destroy

-      # re-calc tax
-     saleObj =  Sale.find(saleitemObj.sale_id)
-     saleObj.compute_without_void
-   end
+    # re-calc tax
+    saleObj = Sale.find(saleitemObj.sale_id)
+    saleObj.compute_without_void
+  end

-   # remove all void items
-   def cancel_all_void
-     sale_id = params[:sale_id]
-     saleObj = Sale.find(sale_id)
-     saleObj.sale_items.each do |item|
-       if item.qty.to_i < 0
-          item.destroy
-       else
-         item.remark = nil
-       end
-       item.save
-     end
+  # remove all void items
+  def cancel_all_void
+    sale_id = params[:sale_id]
+    saleObj = Sale.find(sale_id)
+    saleObj.sale_items.each do |item|
+      if item.qty.to_i < 0
+        item.destroy
+      else
+        item.remark = nil
+      end
+      item.save
+    end

-      # re-calc tax
-     saleObj.compute_without_void
-   end
+    # re-calc tax
+    saleObj.compute_without_void
+  end

-   def apply_void
-     sale_id = params[:sale_id]
-     saleObj =  Sale.find(sale_id)
-     saleObj.compute_without_void
-   end
+  def apply_void
+    sale_id = params[:sale_id]
+    saleObj = Sale.find(sale_id)
+    saleObj.compute_without_void
+  end
 end
--- a/app/controllers/print_settings_controller.rb
+++ b/app/controllers/print_settings_controller.rb
@@ -70,6 +70,6 @@ class PrintSettingsController < ApplicationController

    # Never trust parameters from the scary internet, only allow the white list through.
    def print_setting_params
-      params.require(:print_setting).permit(:name, :unique_code, :template, :db_name, :db_type, :db_username, :db_password, :printer_name, :api_settings, :page_width, :page_height, :print_copies,:precision,:delimiter,:heading_space)
+      params.require(:print_setting).permit(:name, :unique_code, :template, :printer_name, :api_settings, :page_width, :page_height, :print_copies,:precision,:delimiter,:heading_space)
    end
 end
--- a/app/controllers/settings/dining_charges_controller.rb
+++ b/app/controllers/settings/dining_charges_controller.rb
@@ -16,6 +16,9 @@ class Settings::DiningChargesController < ApplicationController
  # GET /dining_charges/new
  def new
    @dining_charge = DiningCharge.new
+    @dining_charge.minimum_free_time="00:30"
+    @dining_charge.charge_block="02:00"
+    @dining_charge.time_rounding_block="00:15"
  end

  # GET /dining_charges/1/edit
@@ -29,7 +32,11 @@ class Settings::DiningChargesController < ApplicationController
    @dining_charge.dining_facility_id = @settings_dining_facility.id
    respond_to do |format|
      if @dining_charge.save
-        format.html { redirect_to edit_settings_zone_table_path(@zone,@settings_dining_facility), notice: 'Dining charge was successfully created.' }
+        if @table
+          format.html { redirect_to edit_settings_zone_table_path(@zone,@settings_dining_facility), notice: 'Dining charge was successfully created.' }
+        else
+          format.html { redirect_to edit_settings_zone_room_path(@zone,@settings_dining_facility), notice: 'Dining charge was successfully created.' }
+        end
        format.json { render :show, status: :created, location: @dining_charge }
      else
        format.html { render :new }
@@ -44,7 +51,11 @@ class Settings::DiningChargesController < ApplicationController
    respond_to do |format|
      @dining_charge.dining_facility_id = @settings_dining_facility.id
      if @dining_charge.update(dining_charge_params)
-        format.html { redirect_to edit_settings_zone_table_path(@zone,@settings_dining_facility), notice: 'Dining charge was successfully updated.' }
+        if @table
+          format.html { redirect_to edit_settings_zone_table_path(@zone,@settings_dining_facility), notice: 'Dining charge was successfully updated.' }
+        else
+          format.html { redirect_to edit_settings_zone_room_path(@zone,@settings_dining_facility), notice: 'Dining charge was successfully updated.' }
+        end
        format.json { render :show, status: :ok, location: @dining_charge }
      else
        format.html { render :edit }