menu updated | edit qty updated

app/controllers/home_controller.rb

@@ -77,7 +77,13 @@ class HomeController < ApplicationController
 
   def route_by_role(employee)
     if employee.role == "administrator"
-      redirect_to dashboard_path
+      # redirect_to dashboard_path
+      shift = ShiftSale.current_open_shift(employee.id)
+      if !shift.nil?
+        redirect_to origami_root_path
+      else
+        redirect_to new_origami_shift_path
+       end
     elsif employee.role == "cashier"
       #check if cashier has existing open cashier
       shift = ShiftSale.current_open_shift(employee.id)

app/controllers/origami/sale_edit_controller.rb

@@ -23,6 +23,26 @@ class Origami::SaleEditController < BaseOrigamiController
      @newsaleitem.save
    end
 
+  def item_edit
+    saleitemId = params[:sale_item_id]
+    update_qty = params[:update_qty]
+    update_price = params[:update_price]
+    saleitemObj = SaleItem.find(saleitemId)
+    saleitemObj.remark = 'void'
+    saleitemObj.save
+    @newsaleitem = SaleItem.new
+    @newsaleitem = saleitemObj.dup
+    @newsaleitem.save
+    @newsaleitem.qty = update_qty
+    @newsaleitem.price = update_price
+    @newsaleitem.unit_price = update_price
+    @newsaleitem.taxable_price = update_price
+    @newsaleitem.is_taxable = 0
+    @newsaleitem.remark = 'edit'
+    @newsaleitem.product_name = saleitemObj.product_name + " - updated"
+    @newsaleitem.save
+  end
+
    # make cancel void item
    def item_void_cancel
      saleitemId = params[:sale_item_id]

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

@@ -49,18 +49,18 @@
                <tr>
                  <td><%= count %></td>
                  <td class='item-name'><%= sale_item.product_name %></td>
-                 <% if sale_item.remark != 'void' %>
+                 <% if sale_item.remark != 'void' && sale_item.remark != 'edit' %>
-                 <td class='item-attr-edit'><input data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.qty %>" /></td>
+                 <td class='item-attr-edit'><input id="<%= sale_item.id%>_qty" data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.qty %>" /></td>
-                 <td class='item-attr-edit'><input data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.price %>" /></td>
+                 <td class='item-attr-edit'><input id="<%= sale_item.id%>_price" data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.price %>" /></td>
                  <td class='item-attr'>
                    <button data-id ="<%= sale_item.id %>" class='btn btn-primary btn-sm update'>Update</button>
                    <button data-id ="<%= sale_item.id %>" class='btn btn-danger btn-sm void'>Void</button></td>
                  </td>
-                 <% elsif sale_item.qty.to_i < 0 %>
+                 <% elsif sale_item.qty.to_i < 0 || sale_item.remark == 'edit' %>
                  <td class='item-attr-edit'><input data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.qty %>" disabled/></td>
                  <td class='item-attr-edit'><input data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.price %>" disabled/></td>
                  <td class='item-attr'>
-                   <button data-id ="<%= sale_item.id %>" class='btn btn-primary btn-sm cancel'>Cancel Void</button>
+                   <button data-id ="<%= sale_item.id %>" class='btn btn-primary btn-sm cancel'>Cancel Void/Update</button>
                  </td>
                  <% else %>
                  <td class='item-attr-edit'><input data-id ="<%= sale_item.id %>" type="text" value="<%= sale_item.qty %>" disabled/></td>
@@ -101,11 +101,14 @@
 $(document).ready(function(){
   $(".update").on('click',function() {
       var sale_item_id = $(this).attr('data-id');
-      var ajax_url = "/origami/item_void";
+      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: 'order_id='+ order_id,
+  		    data: 'sale_item_id='+ sale_item_id + "&update_qty="+qty + "&update_price="+ price,
   		    success:function(result){
             location.reload();
           }

config/routes.rb

@@ -80,6 +80,7 @@ Rails.application.routes.draw do
     post 'moving' => "movetable#moving"
     get "/table/:table_id/sale/:sale_id/edit" => "sale_edit#edit"
     post 'item_void' => "sale_edit#item_void"
+    post 'item_edit' => "sale_edit#item_edit"
     post 'item_void_cancel' => "sale_edit#item_void_cancel"
     post 'cancel_all_void' => 'sale_edit#cancel_all_void'
     post 'apply_void' => 'sale_edit#apply_void'

lib/tasks/menu_import.rake

@@ -93,9 +93,9 @@ menu_category3 = MenuCategory.create({menu: menu, code:"C003", name: "Beef & Mut
 # Pork
 menu_category4 = MenuCategory.create({menu: menu, code:"C004", name: "Pork", alt_name: "Pork", order_by: 4,created_by: "SYSTEM DEFAULT"})
   # Sliced Tenderloin Pork
-  menu_category1_menu_item13 = SimpleMenuItem.create({item_code:"01014", name: "Sliced Tenderloin Pork", alt_name: "Twin Pot",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food })
+  menu_category1_menu_item137 = SimpleMenuItem.create({item_code:"01014", name: "Sliced Tenderloin Pork", alt_name: "Twin Pot",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food })
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0212", menu_item: menu_category1_menu_item13, price:4000.00, is_on_promotion:false}])
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0212", menu_item: menu_category1_menu_item137, price:4000.00, is_on_promotion:false}])
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0211", menu_item: menu_category1_menu_item13, price:8000.00, is_on_promotion:false}])
+    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0211", menu_item: menu_category1_menu_item137, price:8000.00, is_on_promotion:false}])
   # Sliced Pork Belly
   menu_category1_menu_item14 = SimpleMenuItem.create({item_code:"01015", name: "Sliced Pork Belly", alt_name: "Twin Pot",menu_category: menu_category4 , min_selectable_item: 1, max_selectable_item:1, account: food })
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0222", menu_item: menu_category1_menu_item14, price:4000.00, is_on_promotion:false}])
@@ -475,7 +475,7 @@ menu_category14 = MenuCategory.create({menu: menu, code:"C0013", name: "Others",
       menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1142", menu_item: menu_category1_menu_item106, price:1500.00, is_on_promotion:false}])
       menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II1141", menu_item: menu_category1_menu_item106, price:3000.00, is_on_promotion:false}])
 # Sliced Kelp
-    menu_category1_menu_item107 = SimpleMenuItem.create({item_code:"01108", name: "Sliced Kelp", alt_name: "Twin Pot",menu_category: menu_category14 , min_selectable_item: 1, max_selectable_item:1, account: food })
+    menu_category1_menu_item107 = SimpleMenuItem.create({item_code:"01108", name: "Shredded Kelp", alt_name: "Twin Pot",menu_category: menu_category14 , min_selectable_item: 1, max_selectable_item:1, account: food })
       menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1152", menu_item: menu_category1_menu_item107, price:1800.00, is_on_promotion:false}])
       menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II1151", menu_item: menu_category1_menu_item107, price:3600.00, is_on_promotion:false}])
 #  Crystal Vermicelli