Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring

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

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

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

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

app/helpers/settings/promotions_helper.rb

@@ -0,0 +1,2 @@
+module Settings::PromotionsHelper
+end

app/models/product.rb

@@ -0,0 +1,3 @@
+class Product < ApplicationRecord
+  validates_presence_of :name
+end

app/models/promotion.rb

@@ -0,0 +1,2 @@
+class Promotion < ApplicationRecord
+end

app/models/sale.rb

@@ -267,7 +267,7 @@ class Sale < ApplicationRecord
     rounding_adjustment = 0
 
     sales_items.each do |item|
-      if item.remark != 'void'
+      if item.remark != 'void' && item.remark != 'foc'
         #compute each item and added to total
         subtotal_price = subtotal_price + item.price
         total_taxable = total_taxable + item.price

app/views/layouts/_header.html.erb

@@ -28,6 +28,9 @@
               <li><%= link_to "Employees", settings_employees_path, :tabindex =>"-1" %></li>
               <hr class="hr_advance" />
               <li><%= link_to "Accounts", settings_accounts_path, :tabindex =>"-1" %></li>
+              <hr class="hr_advance" />
+              <li><%= link_to "Promotion", settings_promotions_path, :tabindex =>"-1" %></li>]
+              <li><%= link_to "Products", settings_products_path, :tabindex =>"-1" %></li>
           </ul>
         </li>
 

app/views/origami/sale_edit/edit.html.erb

@@ -1,216 +1,235 @@
 <div class="row">
- <!-- Column Two -->
+  <!-- Column Two -->
   <div class="col-lg-10 col-md-10 col-sm-10">
-     <div class="card"  >
-       <div class="card-header">
-          <div><strong id="order-title">INVOICE DETAILS </strong></div>
-       </div>
-       <div class="card-block">
-         <div class="card-title row">
-           <div class="col-lg-6 col-md-6 col-sm-6">
-             <p> Receipt No: <span id="receipt_no">
+    <div class="card">
+      <div class="card-header">
+        <div><strong id="order-title">INVOICE DETAILS </strong></div>
+      </div>
+      <div class="card-block">
+        <div class="card-title row">
+          <div class="col-lg-6 col-md-6 col-sm-6">
+            <p> Receipt No: <span id="receipt_no">
                 <%= @saleobj.receipt_no rescue '' %>
              </span></p>
-           </div>
-           <div class="col-lg-6 col-md-6 col-sm-6 text-right">
-             <p>Date:  <span id="receipt_date"><%= @saleobj.created_at.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span></p>
-           </div>
-         </div>
-         <div class="card-title row customer_detail hide">
-           <div class="col-lg-6 col-md-6 col-sm-6">
-             <p>Customer : <span id="customer_name"></span></p>
-           </div>
+          </div>
+          <div class="col-lg-6 col-md-6 col-sm-6 text-right">
+            <p>Date:
+              <span id="receipt_date"><%= @saleobj.created_at.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-' %></span>
+            </p>
+          </div>
+        </div>
+        <div class="card-title row customer_detail hide">
+          <div class="col-lg-6 col-md-6 col-sm-6">
+            <p>Customer : <span id="customer_name"></span></p>
+          </div>
 
-         </div>
-         <div class="card-text" style="min-height:500px; max-height:500px; overflow-x:scroll">
-           <table class="table " id="order-items-table">
-             <thead>
-               <tr>
-                 <th width="4%">#</th>
-                 <th class="" width="30%">Items</th>
-                 <th style="" width="13%">QTY</td>
-                 <th class="" width="13%">Price</td>
-                 <!-- <th class='' width="17%"> Total </th> -->
-                 <th class='' width="17%"> Action </th>
-               </tr>
-             </thead>
-             <tbody>
-               <%
-                 count = 0
-                 sub_total = 0
-                  @saleobj.sale_items.each do |sale_item|
-                    count += 1
-                  sub_total = sub_total + sale_item.price
-               %>
-               <input type="hidden" id="sale_id" value="<%= @saleobj.sale_id %>">
-               <%
-               # Can't check for discount
-                unless sale_item.price == 0
+        </div>
+        <div class="card-text" style="min-height:500px; max-height:500px; overflow-x:scroll">
+          <table class="table " id="order-items-table">
+            <thead>
+            <tr>
+              <th width="4%">#</th>
+              <th class="" width="30%">Items</th>
+              <th style="" width="13%">QTY
+              </td>
+              <th class="" width="13%">Price
+              </td>
+              <!-- <th class='' width="17%"> Total </th> -->
+              <th class='' width="17%"> Action</th>
+            </tr>
+            </thead>
+            <tbody>
+            <%
+              count = 0
+              sub_total = 0
+              @saleobj.sale_items.each do |sale_item|
+                count += 1
+                sub_total = sub_total + sale_item.price
+            %>
+                <input type="hidden" id="sale_id" value="<%= @saleobj.sale_id %>">
+                <%
+                  # Can't check for discount
+                  unless sale_item.price == 0
                 %>
-               <tr>
-                 <td width="4%"><%= count %></td>
-                 <td class='' width="30%">
-                     <%= sale_item.product_name %>
-                </td>
-                 <% if sale_item.remark != 'void' && sale_item.remark != 'edit' %>
-                    <td class='' width="13%">
-                        <input id="<%= sale_item.id%>_qty" data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.qty %>" class="form-control "/>
-                    </td>
-                    <td class='' width="13%">
-                        <input id="<%= sale_item.id%>_price" data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.unit_price %>" class="form-control"/>
-                    </td>
-                    <!-- <td class='' width="17%">
-                        <input id="<%= sale_item.id%>_price" data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.price %>" class="form-control"/>
+                    <tr>
+                      <td width="4%"><%= count %></td>
+                      <td class='' width="30%">
+                        <%= sale_item.product_name %>
+                      </td>
+                      <% if sale_item.remark != 'void' && sale_item.remark != 'edit' && sale_item.remark != 'foc' %>
+                          <td class='' width="13%">
+                            <input id="<%= sale_item.id %>_qty" data-id="<%= sale_item.id %>" type="text" value="<%= sale_item.qty %>" class="form-control "/>
+                          </td>
+                          <td class='' width="13%">
+                            <input id="<%= sale_item.id %>_price" data-id="<%= sale_item.id %>" type="text" value="<%= sale_item.unit_price %>" class="form-control"/>
+                          </td>
+                          <!-- <td class='' width="17%">
+                        <input id="<%= sale_item.id %>_price" data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.price %>" class="form-control"/>
                     </td> -->
-                   <td class='' width="17%">
-                       <button data-id ="<%= sale_item.id %>" class='btn btn-primary btn-md update'>Update
-                       </button>
-                       <button data-id ="<%= sale_item.id %>" class='btn btn-danger btn-md void'>Void</button>
-                   </td>
+                          <td class='' width="17%">
+                            <button data-id="<%= sale_item.id %>" class='btn btn-primary btn-md update'>Update</button>
+                            <button data-id="<%= sale_item.id %>" class='btn btn-danger btn-md void'>Void</button>
+                            <button data-id="<%= sale_item.id %>" class='btn btn-info btn-md foc'>FOC</button>
+                          </td>
 
-                 <% elsif sale_item.qty.to_i < 0 || sale_item.remark == 'edit' %>
-                 <td class='' width="13%">
-                      <input data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.qty %>" class="form-control" disabled/>
-                 </td>
-                 <td class='' width="13%">
-                    <input data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.unit_price %>" class="form-control" disabled/>
-                 </td>
-                 <!-- <td class='' width="17%">
+                      <% elsif sale_item.qty.to_i < 0 || sale_item.remark == 'edit' %>
+                          <td class='' width="13%">
+                            <input data-id="<%= sale_item.id %>" type="text" value="<%= sale_item.qty %>" class="form-control" disabled/>
+                          </td>
+                          <td class='' width="13%">
+                            <input data-id="<%= sale_item.id %>" type="text" value="<%= sale_item.unit_price %>" class="form-control" disabled/>
+                          </td>
+                          <!-- <td class='' width="17%">
                     <input data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.price %>" class="form-control" disabled/>
                  </td> -->
-                 <td class='' width="17%">
-                   <button data-id ="<%= sale_item.id %>" class='btn btn-primary btn-md cancel'>Cancel Void/Update</button>
-                 </td>
-                 <% else %>
-                 <td class='' width="13%">
-                    <input data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.qty %>" class="form-control" disabled/>
-                </td>
-                 <td class='' width="13%">
-                      <input data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.price %>" class="form-control" disabled/>
-                 </td>
-                 <td></td>
-                 <% end %>
-               </tr>
-               <%
-                   end
-                 end
-               %>
-             </tbody>
-           </table>
-         </div>
-         <div class="card-footer">
-           <table class="table" id="order-charges-table" border="0">
-             <tr>
-               <td class="charges-name"><strong>Sub Total:</strong></td>
-               <td class="item-attr"><strong id="order-sub-total"><%= sub_total %></strong></td>
-             </tr>
-              <tr class="rebate_amount"></tr>
-           </table>
-         </div>
-       </div>
-     </div>
+                          <td class='' width="17%">
+                            <button data-id="<%= sale_item.id %>" class='btn btn-primary btn-md cancel'>Cancel
+                              Void/Update
+                            </button>
+                          </td>
+                      <% else %>
+                          <td class='' width="13%">
+                            <input data-id="<%= sale_item.id %>" type="text" value="<%= sale_item.qty %>" class="form-control" disabled/>
+                          </td>
+                          <td class='' width="13%">
+                            <input data-id="<%= sale_item.id %>" type="text" value="<%= sale_item.price %>" class="form-control" disabled/>
+                          </td>
+                          <td></td>
+                      <% end %>
+                    </tr>
+                <%
+                  end
+                  end
+                %>
+            </tbody>
+          </table>
+        </div>
+        <div class="card-footer">
+          <table class="table" id="order-charges-table" border="0">
+            <tr>
+              <td class="charges-name"><strong>Sub Total:</strong></td>
+              <td class="item-attr"><strong id="order-sub-total"><%= sub_total %></strong></td>
+            </tr>
+            <tr class="rebate_amount"></tr>
+          </table>
+        </div>
+      </div>
+    </div>
   </div>
 
- <!-- Column Three -->
- <div class="col-lg-2 col-md-2 col-sm-2">
-   <!-- Waiter Buttons -->
-   <button type="button" class="btn btn-primary btn-block" id='back' >Back</button>
-   <button type="button" class="btn btn-primary btn-block" id='cancel_all_void' >Cancel All Void</button>
-   <button type="button" class="btn btn-primary btn-block" id='apply' >Apply</button>
- </div>
+  <!-- Column Three -->
+  <div class="col-lg-2 col-md-2 col-sm-2">
+    <!-- Waiter Buttons -->
+    <button type="button" class="btn btn-primary btn-block" id='back'>Back</button>
+    <button type="button" class="btn btn-primary btn-block" id='cancel_all_void'>Cancel All Void</button>
+    <button type="button" class="btn btn-primary btn-block" id='apply'>Apply</button>
+  </div>
 </div>
 <script>
-// Bill Request
-$(document).ready(function(){
-  
-  $(".update").on('click',function() {
-    var sale_item_id = $(this).attr('data-id');
-    var qty = $('#'+sale_item_id + "_qty").val();
-    var price = $('#'+ sale_item_id + "_price").val();
-    console.log(qty + "|" + price)
-    var ajax_url = "/origami/item_edit";
-    $.ajax({
-     type: "POST",
-     url: ajax_url,
-     data: 'sale_item_id='+ sale_item_id + "&update_qty="+qty + "&update_price="+ price,
-     success:function(result){
-      $.confirm({
-        title: 'Alert!',
-        content: 'Qty and Price was successfully Updated',
-        buttons: {
+    // Bill Request
+    $(document).ready(function () {
 
-          confirm: {
-            text: 'Ok',
-            btnClass: 'btn-green btn-lg',
-            action: function(){
-              location.reload();
+        $(".update").on('click', function () {
+            var sale_item_id = $(this).attr('data-id');
+            var qty = $('#' + sale_item_id + "_qty").val();
+            var price = $('#' + sale_item_id + "_price").val();
+            console.log(qty + "|" + price)
+            var ajax_url = "/origami/item_edit";
+            $.ajax({
+                type: "POST",
+                url: ajax_url,
+                data: 'sale_item_id=' + sale_item_id + "&update_qty=" + qty + "&update_price=" + price,
+                success: function (result) {
+                    $.confirm({
+                        title: 'Alert!',
+                        content: 'Qty and Price was successfully Updated',
+                        buttons: {
+
+                            confirm: {
+                                text: 'Ok',
+                                btnClass: 'btn-green btn-lg',
+                                action: function () {
+                                    location.reload();
+                                }
+                            }
+                        }
+                    });
+
+                }
+            });
+        });
+
+        $('.void').on('click', function () {
+            var sale_item_id = $(this).attr('data-id');
+            var ajax_url = "/origami/item_void";
+            $.ajax({
+                type: "POST",
+                url: ajax_url,
+                data: 'sale_item_id=' + sale_item_id,
+                success: function (result) {
+                    location.reload();
+                }
+            });
+        })
+
+        $('.foc').on('click', function () {
+            var sale_item_id = $(this).attr('data-id');
+            var ajax_url = "/origami/item_foc";
+            $.ajax({
+                type: "POST",
+                url: ajax_url,
+                data: 'sale_item_id=' + sale_item_id,
+                success: function (result) {
+                    location.reload();
+                }
+            });
+        })
+
+        $('.cancel').on('click', function () {
+            var sale_item_id = $(this).attr('data-id');
+            var ajax_url = "/origami/item_void_cancel";
+            $.ajax({
+                type: "POST",
+                url: ajax_url,
+                data: 'sale_item_id=' + sale_item_id,
+                success: function (result) {
+                    location.reload();
+                }
+            });
+        })
+
+
+    })
+
+    $('#back').on('click', function () {
+        var table_id = '<%= @table_id %>'
+        window.location.href = '/origami/table/' + table_id;
+    })
+
+    $('#cancel_all_void').on('click', function () {
+        var sale_id = "<%= @saleobj.sale_id %>"
+        var ajax_url = "/origami/cancel_all_void";
+        $.ajax({
+            type: "POST",
+            url: ajax_url,
+            data: 'sale_id=' + sale_id,
+            success: function (result) {
+                location.reload();
             }
-          }  
-        }
-      });
+        });
+    })
 
-    }
-  });
-  });
-
-  $('.void').on('click',function(){
-    var sale_item_id = $(this).attr('data-id');
-    var ajax_url = "/origami/item_void";
-    $.ajax({
-      type: "POST",
-        url: ajax_url,
-        data: 'sale_item_id='+ sale_item_id,
-        success:function(result){
-          location.reload();
-        }
-    });
-  })
-
-  $('.cancel').on('click',function(){
-    var sale_item_id = $(this).attr('data-id');
-    var ajax_url = "/origami/item_void_cancel";
-    $.ajax({
-      type: "POST",
-        url: ajax_url,
-        data: 'sale_item_id='+ sale_item_id,
-        success:function(result){
-          location.reload();
-        }
-    });
-  })
-
-
-})
-
-$('#back').on('click',function(){
-  var table_id = '<%= @table_id %>'
-  window.location.href = '/origami/table/'+ table_id;
-})
-
-$('#cancel_all_void').on('click',function(){
-  var sale_id = "<%= @saleobj.sale_id %>"
-  var ajax_url = "/origami/cancel_all_void";
-  $.ajax({
-    type: "POST",
-      url: ajax_url,
-      data: 'sale_id='+ sale_id,
-      success:function(result){
-        location.reload();
-      }
-  });
-})
-
-$('#apply').on('click',function(){
-  var sale_id = "<%= @saleobj.sale_id %>"
-  var ajax_url = "/origami/apply_void";
-  var table_id = '<%= @table_id %>'
-  $.ajax({
-    type: "POST",
-      url: ajax_url,
-      data: 'sale_id='+ sale_id,
-      success:function(result){
-        window.location.href = '/origami/table/'+ table_id ;
-      }
-  });
-})
+    $('#apply').on('click', function () {
+        var sale_id = "<%= @saleobj.sale_id %>"
+        var ajax_url = "/origami/apply_void";
+        var table_id = '<%= @table_id %>'
+        $.ajax({
+            type: "POST",
+            url: ajax_url,
+            data: 'sale_id=' + sale_id,
+            success: function (result) {
+                window.location.href = '/origami/table/' + table_id;
+            }
+        });
+    })
 </script>

app/views/settings/dining_charges/_form.html.erb

@@ -3,13 +3,14 @@
 
   <div class="form-inputs">
     <%= f.input :item_code, :input_html => { :id => 'item_code' } %>
-    <%= f.input :unit_price %>
+    <%= f.input :unit_price, :input_html => { :id => 'unit_price'} %>
     <%= f.input :taxable %>
     <%= f.input :charge_type, :collection => [:hr, :day] %>
     <%= f.input :minimum_free_time %>
-    <%= f.input :charge_block %>
+    <%= f.input :charge_block, :input_html => { :id => 'charge_block'} %>
     <%= f.input :time_rounding %>
-    <%= f.input :time_rounding_block %>
+    <%= f.input :time_rounding_block, :input_html => { :id => 'time_rounding_block'} %>
+    <%= f.input :time_rounding_block_price, :input_html => { :id => 'time_rounding_block_price'} %>
   </div>
 
   <div class="form-actions">
@@ -17,3 +18,39 @@
   </div>
 <% end %>
 
+<script>
+
+function price(){
+    var unit_price = $("#unit_price").val();
+
+    var hour1 = $("select[name='dining_charge[time_rounding_block(4i)]']").val();
+    var min1 = $("select[name='dining_charge[time_rounding_block(5i)]']").val();
+    var time1=(parseInt(hour1)*60)+parseInt(min1);
+
+    var hour2 = $("select[name='dining_charge[charge_block(4i)]']").val();
+    var min2 = $("select[name='dining_charge[charge_block(5i)]']").val();
+    var time2=(parseInt(hour2)*60)+parseInt(min2);
+
+    var result=(unit_price*time1)/time2;
+    $("#time_rounding_block_price").val(result);
+    // return result;
+}
+
+
+$( "#unit_price" ).change(function() {
+  price();
+});
+$( "select[name='dining_charge[time_rounding_block(4i)]']" ).change(function() {
+  price();
+});
+$( "select[name='dining_charge[time_rounding_block(5i)]']" ).change(function() {
+  price();
+});
+$( "select[name='dining_charge[charge_block(4i)]']" ).change(function() {
+  price();
+});
+$( "select[name='dining_charge[charge_block(5i)]']" ).change(function() {
+  price();
+});
+
+</script>

app/views/settings/dining_charges/new.html.erb

@@ -16,8 +16,9 @@
 		</div>
     <%= render 'form', dining_charge: @dining_charge %>
 </div>
+
 <script>
-function randomNumber(len) {
+  function randomNumber(len) {
     var randomNumber;
     var n = '';
 
@@ -27,6 +28,5 @@ function randomNumber(len) {
     }
     return n;
 }
-
-document.getElementById("item_code").value = "<%= @zone.id %>"+"<%= @settings_dining_facility.id %>"+"_"+randomNumber(5);
+document.getElementById("item_code").value = "<%= @zone.id %>"+"<%= @settings_dining_facility.id %>"+"_"+randomNumber(5); 
 </script>

app/views/settings/products/_form.html.erb

@@ -0,0 +1,18 @@
+<%= simple_form_for([:settings,@settings_product]) do |f| %>
+  <%= f.error_notification %>
+
+  <div class="form-inputs">
+    <%= f.input :item_code, :input_html => { :id => 'item_code' } %>
+    <%= f.input :name %>
+    <%= f.input :alt_name %>
+    <%= f.input :unit_price %>
+    <%= f.input :image_path %>
+    <%= f.input :description %>
+    <%= f.input :information %>
+    <label><%= f.check_box :taxable %>Taxable</label>
+  </div>
+
+  <div class="form-actions">
+    <%= f.button :submit %>
+  </div>
+<% end %>

app/views/settings/products/_settings_product.json.jbuilder

@@ -0,0 +1,2 @@
+json.extract! settings_product, :id, :created_at, :updated_at
+json.url settings_product_url(settings_product, format: :json)

app/views/settings/products/edit.html.erb

@@ -0,0 +1,10 @@
+<div class="span12">
+	<div class="page-header">
+	 <ul class="breadcrumb">
+	   	<li><a href="<%= root_path %>">Home</a></li>
+			<li><a href="<%= settings_products_path %>">Products</a></li>
+	  	<li>Edit</li>
+	 </ul>
+	</div>
+    <%= render 'form', settings_product: @settings_product %>
+</div>

app/views/settings/products/index.html.erb

@@ -0,0 +1,45 @@
+<div class="page-header">
+ <ul class="breadcrumb">
+  <li><a href="<%=  %>">Home</a></li>
+  <li>Product</li>
+  <span style="float: right">
+    <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_product_path,:class => 'btn btn-primary btn-sm' %>
+  </span>
+ </ul>
+</div>
+
+<br>
+<div class="card">
+  <table class="table table-striped">
+    <thead>
+      <tr>
+        <th>Item Code</th>
+        <th>Name</th>
+        <th>Alt Name</th>
+        <th>Unit Price</th>
+        <!-- <th style="width:20%">image_path</th> -->
+        <th>Description</th>
+        <th>Information</th>
+        <th>Taxable</th>
+        <th colspan="3"></th>
+      </tr>
+    </thead>
+
+    <tbody>
+      <% @settings_products.each do |settings_product| %>
+        <tr>
+          <td><%= settings_product.item_code  %></td>
+          <td><%= settings_product.name %></td>
+          <td><%= settings_product.alt_name %></td>
+          <td><%= settings_product.unit_price %></td>
+          <td><%= settings_product.description %></td>
+          <td><%= settings_product.information %></td>
+          <td><%= settings_product.taxable %></td>
+          <td><%= link_to 'Show', settings_product_path(settings_product) %></td>
+          <td><%= link_to 'Edit', edit_settings_product_path(settings_product) %></td>
+          <td><%= link_to 'Destroy', settings_product_path(settings_product), method: :delete, data: { confirm: 'Are you sure?' } %></td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>

app/views/settings/products/index.json.jbuilder

@@ -0,0 +1 @@
+json.array! @settings_products, partial: 'settings_products/settings_product', as: :settings_product

app/views/settings/products/new.html.erb

@@ -0,0 +1,26 @@
+<div class="span12">
+	<div class="page-header">
+	 <ul class="breadcrumb">
+	   	<li><a href="<%= root_path %>">Home</a></li>
+			<li><a href="<%= settings_products_path %>">Products</a></li>
+	  	<li>New</li>
+	 </ul>
+	</div>
+    <%= render 'form', settings_product: @settings_product %>
+</div>
+
+<script>
+	function randomNumber(len) {
+			var sValidCharacters = "01234ABCDEFGHIJabcdefghijk56789lmnKLMNOPQRSTUVWXYZopqrstuvwxyz";
+			var sCharCode = "";
+
+			for (i = 1; i <= len; i++) {
+			    sCharCode = sCharCode + sValidCharacters.charAt(parseInt(Math.random() * sValidCharacters.length));
+					if ((i === 4) || (i === 8)) {
+        		sCharCode = sCharCode + "-";
+    			}
+				}
+					return sCharCode;
+			}
+document.getElementById("item_code").value = randomNumber(12);
+</script>

app/views/settings/products/show.html.erb

@@ -0,0 +1,33 @@
+<div class="page-header">
+ <ul class="breadcrumb">
+  <li><a href="<%= root_path %>">Home</a></li>
+  <li><a href="<%= settings_products_path %>">Products</a></li>
+
+  <span style="float: right">
+  </span>
+ </ul>
+</div>
+<div class="card">
+  <div class="card-block">
+    <h4 class="card-title">Product</h4>
+    <table class="table">
+
+      <tbody>
+
+          <tr><td style="width:20%">Item code</td><td><%= @settings_product.item_code  %></td></tr>
+          <tr><td style="width:20%">Name</td><td><%= @settings_product.name %></td></tr>
+          <tr><td style="width:20%">Alt name</td><td><%= @settings_product.alt_name %></td></tr>
+          <tr><td style="width:20%">Unit price</td><td><%= @settings_product.unit_price %></td></tr>
+          <tr><td style="width:20%">Image path</td><td><%= image_tag @settings_product.image_path, :size => '200x200'%></td></tr>
+          <tr><td style="width:20%">Description</td><td><%= @settings_product.description %></td></tr>
+          <tr><td style="width:20%">Information</td><td><%= @settings_product.information %></td></tr>
+          <tr><td style="width:20%">Taxable</td><td><%= @settings_product.taxable %></td></tr>
+          <tr><td style="width:20%"><%= link_to 'Edit', edit_settings_product_path(@settings_product) %></td><td><%= link_to 'Destroy', settings_product_path(@settings_product), method: :delete, data: { confirm: 'Are you sure?' } %></td></tr>
+
+
+      </tbody>
+    </table>
+  </div>
+</div>
+
+</div>

app/views/settings/products/show.json.jbuilder

@@ -0,0 +1 @@
+json.partial! "settings_products/settings_product", settings_product: @settings_product

app/views/settings/promotions/_form.html.erb

@@ -0,0 +1,48 @@
+<%= simple_form_for([:settings,@promotion]) do |f| %>
+  <%= f.error_notification %>
+
+  <div class="form-inputs">
+    <div class="div-border">
+        <div class="row">
+          <div class="col-md-6"><%= f.input :promo_code  %></div>
+          <div class="col-md-6"></div>
+        </div>
+        <div class="row">
+          <div class="col-md-6">
+            <span>Promo Start Date</span>
+            <%= f.date_field  :promo_start_date, :placeholder => "From Date" , :class => "form-control"%>
+            <br>
+          </div>
+          <div class="col-md-6">
+            <span>Promo End Date</span>
+            <%= f.date_field :promo_end_date ,:placeholder => "To Date" , :class => "form-control"%>
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-md-6">
+            <%= f.input :promo_start_hour %>
+            <!-- <span>Promo Start Hour</span>
+            <%= text_field_tag :promo_start_hour , nil, :placeholder => "From Time", :id => "fromtime", :class => 'form-control' %> -->
+          </div>
+          <div class="col-md-6"><%= f.input :promo_end_hour %></div>
+        </div>
+        <div class="row">
+          <div class="col-md-12"><%= f.input :promo_day %></div>
+        </div>
+        <div class="row">
+          <div class="col-md-6">
+            <%= f.input :promo_type,input_html: { class: "" },
+          collection: %w{Quantity Net_off Net_price Percentage},:class => 'form-control' ,:label => "" %>
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-md-6"><%= f.input :original_product,collection: MenuItem.order("name desc"),input_html: { selected: 2 } %></div>
+          <div class="col-md-6"><%= f.input :min_qty %></div>
+        </div>
+    </div>
+  </div>
+
+  <div class="form-actions">
+    <%= f.button :submit %>
+  </div>
+<% end %>

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)

app/views/settings/promotions/edit.html.erb

@@ -0,0 +1,10 @@
+<div class="span12">
+		<div class="page-header">
+		 <ul class="breadcrumb">
+		   	<li><a href="<%= root_path %>">Home</a></li>
+  			<li><a href="<%= settings_promotions_path %>">Promotions</a></li>
+		  	<li>Edit</li>
+		 </ul>
+		</div>
+    <%= render 'form', promotion: @promotion %>
+</div>

app/views/settings/promotions/index.html.erb

@@ -0,0 +1,58 @@
+<p id="notice"><%= notice %></p>
+
+
+<div class="page-header">
+ <ul class="breadcrumb">
+  <li><a href="<%= root_path %>">Home</a></li>
+  <li>Promotions</li>
+  <span style="float: right">
+    <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_promotion_path,:class => 'btn btn-primary btn-sm' %>
+  </span>
+ </ul>
+</div>
+
+<br>
+<div class="card">
+  <table class="table table-striped">
+    <thead>
+      <tr>
+        <th>Promotion Code</th>
+        <th>Start Date</th>
+        <th>End Date</th>
+        <th>Start Time</th>
+        <th>End Time</th>
+        <th>Promotion Day</th>
+        <th>Original Product</th>
+        <th>Created By</th>
+        <th>Created At</th>
+        <th colspan="2"></th>
+      </tr>
+    </thead>
+
+    <tbody>
+      <% @promotions.each do |pro| %>
+        <tr>
+          <td><%= link_to pro.promo_code, settings_promotion_path(pro) %></td>
+          <td><%= pro.promo_start_date %></td>
+          <td><%= pro.promo_end_date %></td>
+          <td><%= pro.promo_start_hour.strftime("%I:%M %P") rescue "-" %></td>
+          <td><%= pro.promo_end_hour.strftime("%I:%M %P") rescue "-" %></td>
+          <td><%= pro.promo_day %></td>
+          <td>
+            <% if MenuItem.exists?(pro.original_product) %>
+            <%= MenuItem.find(pro.original_product).name %>
+            <% end %>
+          </td>
+          <% if Employee.exists?(pro.created_by) %>
+          <td><%= Employee.find(pro.created_by).name %></td>
+          <% else %>
+          <td><%= pro.created_by %></td>
+          <% end %>
+          <td><%= pro.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
+          <td><%= link_to 'Edit', edit_settings_promotion_path(pro) %></td>
+          <td><%= link_to 'Destroy', settings_promotion_path(pro), method: :delete, data: { confirm: 'Are you sure?' } %></td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>

app/views/settings/promotions/index.json.jbuilder

@@ -0,0 +1 @@
+json.array! @promotions, partial: 'promotions/promotion', as: :promotion

app/views/settings/promotions/new.html.erb

@@ -0,0 +1,17 @@
+
+<div class="span12">
+		<div class="page-header">
+		 <ul class="breadcrumb">
+		   	<li><a href="<%= root_path %>">Home</a></li>
+  			<li><a href="<%= settings_promotions_path %>">Promotions</a></li>
+		  	<li>New</li>
+		 </ul>
+		</div>
+    <%= render 'form', promotion: @promotion %>
+</div>
+<script>
+$("#promotion_promo_code").val(Math.random().toString(36).slice(5) + Math.random().toString(36).slice(5));
+// $( "#fromtime" ).timepicker();
+// $( "#totime" ).timepicker({ 'scrollDefault': 'now' });
+$('#scrollDefaultExample').timepicker({ 'scrollDefault': 'now' });
+</script>

app/views/settings/promotions/show.html.erb

@@ -0,0 +1,4 @@
+<p id="notice"><%= notice %></p>
+
+<%= link_to 'Edit', edit_promotion_path(@promotion) %> |
+<%= link_to 'Back', promotions_path %>

app/views/settings/promotions/show.json.jbuilder

@@ -0,0 +1 @@
+json.partial! "promotions/promotion", promotion: @promotion