smerp-quotation-engine 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '078b0b00dc1fa24d1c265ed3e8376f747db91b6664358915686ea7eaea2e4404'
-  data.tar.gz: cdc5d36de1c87ce2a2a916b0573e4d34b1966110d224a6b40352a8906e54f351
+  metadata.gz: f71b4dd4f66d6b3a84d08becf612915e07c73d559b9b45b1739474e78670d48e
+  data.tar.gz: 808298fcebe1eea7dc2cc7820b34ce7ee68db717a76f3b948c1430def58cfe20
 SHA512:
-  metadata.gz: 2e5d50a0b5d0b0c0d819cd86b6bc42077260394cb84e8dbb9a8c43cd0088f68a34b41d8c27611da9ef5dd9f699b54149a887b2b3131b7a6a314db19e1f0223cf
-  data.tar.gz: 6b3f0dba38911e1d852e3dc40b388e92438c247931be0eeff4f532d6d8a4dc9c36f3cf899d33cde71190827e00ea8ec950f7a59b4ce6ca6150cdca39da5ce2fd
+  metadata.gz: 8d43e99812253d2be32facd3e28a76b299074258db6574a54ff83cad2b772491854d88f3dc57579409834140adc7ddbc84dc00d92e986d5dd5ba43a0eb8aaae7
+  data.tar.gz: 2cc26d8e261f27eb6f09fd8ddd30367df751b4395f038c1653fe61bb6b72e506d4c18da81d25a5ac73cecf4ad2259cb5b38d63cbeff11189e874f9c4f53c1fab

data/app/controllers/smerp/quotation/engine/quotation_items_controller.rb

@@ -66,7 +66,7 @@ module Smerp::Quotation::Engine
 
     # DELETE /quotation_items/1
     def destroy
-      q = @quotation_item.quotation.clone
+      q = @quotation_item.quotation
       @quotation_item.destroy
       
       redirect_to quotation_url(q), notice: "Quotation item was successfully destroyed."

data/app/controllers/smerp/quotation/engine/quotation_products_controller.rb

@@ -25,7 +25,8 @@ module Smerp::Quotation::Engine
       @quotation_product = QuotationProduct.new(quotation_product_params)
 
       if @quotation_product.save
-        redirect_to @quotation_product, notice: "Quotation product was successfully created."
+        #redirect_to @quotation_product, notice: "Quotation product was successfully created."
+        redirect_to quotation_products_path, notice: "Quotation product was successfully created."
       else
         render :new, status: :unprocessable_entity
       end

data/app/views/smerp/quotation/engine/quotation_products/_quotation_product.html.erb

@@ -1,6 +1,7 @@
 <div id="<%= dom_id quotation_product %>">
 
   <tr>
+    <td><%= cnt %>.</td>
     <td><%= link_to quotation_product.name, quotation_product %></td>
     <td><%= quotation_product.quotation_product_category.name %></td>
     <td><%= quotation_product.state.titleize %></td>

data/app/views/smerp/quotation/engine/quotation_products/index.html.erb

@@ -5,13 +5,16 @@
 <div id="quotation_products">
   <table class="table">
     <tr>
+      <th width="18px"></th>
       <th>Name</th>
       <th>Category</th>
       <th>Status</th>
     </tr>
-    
+
+    <% cnt = 1 %>
   <% @quotation_products.each do |quotation_product| %>
-    <%= render quotation_product %>
+    <%= render quotation_product, cnt: cnt %>
+    <% cnt += 1 %>
   <% end %>
   </table>
 </div>

data/app/views/smerp/quotation/engine/quotations/_quotation_item.html.erb

@@ -35,12 +35,15 @@
         <% end %>
       </div>
     </td>
+
+    <% consolDest = quotation_item.is_consolidation_destination_item? %>
+    <% consolSrc = quotation_item.is_consolidation_source_item? %>
     
     <td class="text-end">
 
-      <% if quotation_item.is_consolidation_destination_item? %>
+      <% if consolDest %>
         <%= currency(quotation_item.consolidated_line_total) %>
-      <% elsif quotation_item.is_consolidation_source_item? %>
+      <% elsif consolSrc %>
         <%= currency(quotation_item.balance_after_distribution[:balance_amount]) %> *
       <% else %>
         <%= currency(quotation_item.line_total) %>
@@ -68,26 +71,26 @@
     </td>
     
     <td class="text-end">
-      <% if not quotation_item.is_consolidation_source_item? %>
+      <% if not consolSrc  %>
         <%= link_to currency(quotation_item.discount), "#dist#{quotation_item.id}", "data-bs-toggle" => "collapse", "aria-expanded" => "false", "aria-controls" => "dist#{quotation_item.id}", role: "button" %>
       <% end %>
     </td>
     
     <td>
-      <% if not quotation_item.is_consolidation_source_item? %>
+      <% if not consolSrc %>
       (<%= quotation_item.discount.percent_of(quotation_item.line_total,2) %>%)
       <% end %>
     </td>
     
     <td class="text-end">
-      <% if not quotation_item.is_consolidation_source_item? %>
+      <% if not consolSrc %>
       <%= currency(quotation_item.line_total_after_discount) %>
       <% end %>
     </td>
     
     <td class="text-end">
 
-      <% if not quotation_item.is_consolidation_source_item? %>
+      <% if not consolSrc %>
       <%= link_to currency(quotation_item.tax), "#tax#{quotation_item.id}", "data-bs-toggle" => "collapse", "aria-expanded" => "false", "aria-controls" => "tax#{quotation_item.id}", role: "button" %>
       <div class="collapse" id="tax<%= quotation_item.id %>">
         <%= form_for(:quotation_item, url: apply_tax_quotation_item_path(quotation_item), method: :post) do |f| %>
@@ -111,13 +114,13 @@
     </td>
 
     <td>
-      <% if not quotation_item.is_consolidation_source_item? %>
+      <% if not consolSrc %>
       <%= link_to image_tag('taxfree.png', size: "22x22"), remove_tax_quotation_item_path(quotation_item), data: { turbo_method: "post" } %>
       <% end %>
     </td>
 
     <td class="text-end">
-      <% if not quotation_item.is_consolidation_source_item? %>
+      <% if not consolSrc %>
       <%= currency(quotation_item.line_total_with_tax) %>
       <% end %>
     </td>
@@ -129,7 +132,7 @@
   </tr>
 
 
-  <% if quotation_item.is_consolidation_destination_item? %>
+  <% if consolDest %>
 
     <tr style="background-color: <%= level_marker(level) %>">
         <td class="text-end" style="font-style: italic"><%= quotation_item.name %> (Existing Value)</td>

data/lib/smerp/quotation/engine/version.rb

@@ -1,7 +1,7 @@
 module Smerp
   module Quotation
     module Engine
-      VERSION = "0.2.0"
+      VERSION = "0.2.2"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smerp-quotation-engine
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Ian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-03 00:00:00.000000000 Z
+date: 2022-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails