Merge branch 'adminbsb_material_ui'

app/models/dining_charge.rb

@@ -35,16 +35,24 @@ class DiningCharge < ApplicationRecord
 
     result = dining_minutes / charge_block
 
+    rounding_time = DiningCharge.convert_to_minutes(chargesObj.time_rounding_block.utc.strftime('%H:%M'))
     if result.to_i < 1
       # for dining minute is under charge_block
-      return 1, result.to_i,chargesObj.unit_price
-    elsif result.to_i >= 1      
+      if dining_minutes > rounding_time 
+        rounding_block = dining_minutes % rounding_time
+        solid_price = rounding_block * chargesObj.time_rounding_block_price
+        return 1, solid_price,chargesObj.unit_price
+
+      else
+        return 1, result.to_i,chargesObj.unit_price
+      end
+    elsif result.to_i >= 1 
 
        solid_price = result * chargesObj.unit_price
 
        remain_value = dining_minutes % charge_block
 
-       rounding_time = DiningCharge.convert_to_minutes(chargesObj.time_rounding_block.utc.strftime('%H:%M'))
+       # rounding_time = DiningCharge.convert_to_minutes(chargesObj.time_rounding_block.utc.strftime('%H:%M'))
 
        roundingblock = remain_value / rounding_time
 

lib/tasks/clear_data.rake

@@ -49,4 +49,18 @@ namespace :clear do
     Account.destroy_all
     puts "Clear all Menu Done."
   end
+
+  desc "Clear-- Inventory"
+  task :stock => :environment do
+   
+    
+    InventoryDefinition.destroy_all
+    StockJournal.destroy_all
+   
+    StockCheck.destroy_all
+    
+    StockCheckItem.destroy_all
+    
+    puts "Clear all Menu Done."
+  end
 end