smerp-quotation-engine 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32de6281378bf9d836b4b7cdd1a32ed952e1e0cfdc4127aae6f4c569f5b02e1f
-  data.tar.gz: 1d9ad81ffb2aca437e9aa78de0e66dd6f9cfb95a865c5e997b51a7af95f6edd0
+  metadata.gz: '078b0b00dc1fa24d1c265ed3e8376f747db91b6664358915686ea7eaea2e4404'
+  data.tar.gz: cdc5d36de1c87ce2a2a916b0573e4d34b1966110d224a6b40352a8906e54f351
 SHA512:
-  metadata.gz: 3ae01c0cad4ccb9b1b7445a979ec872f2cc7a2b6210e1cb695040007d96e71d613cf0e39eaa08cd0174966a319a6c31e215e0d64153b9a90d8bd5a2d5c3a00dc
-  data.tar.gz: b224635e6c4c96660f637b12c1ce6c51e134d8a40bb8d1ebde9215d297d6fc3d830c5fc80dac81608559be6c16d2f4d8a73027a40dcace54463036f6b2f72a91
+  metadata.gz: 2e5d50a0b5d0b0c0d819cd86b6bc42077260394cb84e8dbb9a8c43cd0088f68a34b41d8c27611da9ef5dd9f699b54149a887b2b3131b7a6a314db19e1f0223cf
+  data.tar.gz: 6b3f0dba38911e1d852e3dc40b388e92438c247931be0eeff4f532d6d8a4dc9c36f3cf899d33cde71190827e00ea8ec950f7a59b4ce6ca6150cdca39da5ce2fd

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

@@ -0,0 +1,95 @@
+module Smerp::Quotation::Engine
+  class QuotationItemDistributionsController < ApplicationController
+
+    before_action :set_quotation_item
+    before_action :set_quotation_item_distribution, only: %i[ show edit update destroy ]
+
+    def set_quotation_item
+      #@quotation_item = QuotationItem.find(params[:id])
+      #@quotation = @quotation_item.quotation
+    end
+
+    # GET /quotation_item_distributions
+    def index
+      @quotation_item_distributions = QuotationItemDistribution.all
+    end
+
+    # GET /quotation_item_distributions/1
+    def show
+    end
+
+    # GET /quotation_item_distributions/new
+    def new
+      @quotation_item = QuotationItem.find(params[:source_quotation_item])
+      @quotation = @quotation_item.quotation
+      @quotation_item_distribution = QuotationItemDistribution.new
+    end
+
+    # GET /quotation_item_distributions/1/edit
+    def edit
+    end
+
+    # POST /quotation_item_distributions
+    def create
+      #@quotation_item_distribution = QuotationItemDistribution.new(quotation_item_distribution_params)
+
+      qi = QuotationItem.find(params[:quotation_item_distribution][:quotation_item_id])
+
+      if not params[:quotation_item_distribution].nil? and not params[:quotation_item_distribution][:quantum].nil?
+        params[:quotation_item_distribution][:quantum].each do |k,v|
+
+          vv = v.first
+          indx = vv =~ /p/
+          if indx.nil?
+            val = vv.to_f
+            next if val == 0
+          else
+            val = vv[0...indx].to_f.percent
+            next if val.rep_value == 0
+          end
+
+          dest = QuotationItem.find(k)
+          qi.distribute_to(dest, val)
+
+        end
+      end
+
+      redirect_to quotation_path(qi.quotation), notice: "Distribution saved"
+
+      #if @quotation_item_distribution.save
+      #  redirect_to @quotation_item_distribution, notice: "Quotation item distribution was successfully created."
+      #else
+      #  render :new, status: :unprocessable_entity
+      #end
+    end
+
+    # PATCH/PUT /quotation_item_distributions/1
+    def update
+      if @quotation_item_distribution.update(quotation_item_distribution_params)
+        redirect_to @quotation_item_distribution, notice: "Quotation item distribution was successfully updated."
+      else
+        render :edit, status: :unprocessable_entity
+      end
+    end
+
+    # DELETE /quotation_item_distributions/1
+    def destroy
+      @quotation_item = @quotation_item_distribution.quotation_item
+      @quotation_item_distribution.destroy
+      #redirect_to quotation_item_distributions_url, notice: "Quotation item distribution was successfully destroyed."
+      redirect_to quotation_path(@quotation_item.quotation), notice: "Quotation item distribution was successfully destroyed."
+    end
+
+    private
+      # Use callbacks to share common setup or constraints between actions.
+      def set_quotation_item_distribution
+        @quotation_item_distribution = QuotationItemDistribution.find(params[:id])
+      end
+
+      # Only allow a list of trusted parameters through.
+      def quotation_item_distribution_params
+        params.fetch(:quotation_item_distribution, {})
+        #params.require(:quotation_item_distribution).permit()
+      end
+  end
+end

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

@@ -4,7 +4,7 @@ module Smerp::Quotation::Engine
     include TR::CondUtils
 
     before_action :find_parent
-    before_action :set_quotation_item, only: %i[ show edit update destroy apply_discount remove_tax add_sub_item apply_tax hide_children show_children new_product_item ]
+    before_action :set_quotation_item, only: %i[ show edit update destroy apply_discount remove_tax add_sub_item apply_tax hide_children show_children new_product_item distribute ]
 
     def find_parent
       if params[:quotation_item].nil?
@@ -222,6 +222,11 @@ module Smerp::Quotation::Engine
       @quotation_item = QuotationItem.new
     end
 
+    def distribute
+      @quotation = @quotation_item.quotation
+      #redirect_to quotation_url(@quotation_item.quotation)
+    end
+
     private
       # Use callbacks to share common setup or constraints between actions.
       def set_quotation_item

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

@@ -25,8 +25,7 @@ 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_products_path, notice: "Quotation product was successfully created."
+        redirect_to @quotation_product, notice: "Quotation product was successfully created."
       else
         render :new, status: :unprocessable_entity
       end

data/app/helpers/smerp/quotation/engine/quotation_item_distributions_helper.rb

@@ -0,0 +1,14 @@
+module Smerp::Quotation::Engine
+  module QuotationItemDistributionsHelper
+
+    def distribution_params(paramVal)
+      case paramVal
+      when Smerp::Common::FinUtils::Percent
+        "#{paramVal.value}%"
+      else
+        "#{currency(paramVal)}"
+      end
+    end
+
+  end
+end

data/app/helpers/smerp/quotation/engine/quotation_items_helper.rb

@@ -1,4 +1,32 @@
 module Smerp::Quotation::Engine
   module QuotationItemsHelper
+
+    def render_item_tree_table(itm, level = 1, indx = 0)
+      cont = []
+      level += 1
+      indx = 0
+      if session[:hide_children_parent_id].nil? or not session[:hide_children_parent_id].include?(itm.id)
+        itm.children.each do |c|
+          cont << render("quotation_item", quotation_item: c, level: level, index: indx)
+          indx += 1
+          cont += render_item_tree_table(c, level, indx)
+        end
+      end
+      cont
+      
+    end
+
+    def level_marker(level)
+      marker = [
+        "#DBFED8", #light green
+        "#FEF0D8",
+        "#D8F8FE",
+        "#FED8D8"
+      ]
+
+      marker[level%4]
+    end
+
+    
   end
 end

data/app/helpers/smerp/quotation/engine/quotations_helper.rb

@@ -1,19 +1,19 @@
 module Smerp::Quotation::Engine
   module QuotationsHelper
 
-    def render_item_tree(itm)
-      cont = []
-      cont << "<ol type=\"i\">"
-      itm.children.each do |c|
-        cont << "<div id=\"quotation_items\">"
-        cont << render("quotation_item", quotation_item: c)
-        cont << "</div>"
+    #def render_item_tree(itm)
+    #  cont = []
+    #  cont << "<ol type=\"i\">"
+    #  itm.children.each do |c|
+    #    cont << "<div id=\"quotation_items\">"
+    #    cont << render("quotation_item", quotation_item: c)
+    #    cont << "</div>"
 
-        cont += render_item_tree(c)
-      end
-      cont << "</ol>"
-      cont
-    end
+    #    cont += render_item_tree(c)
+    #  end
+    #  cont << "</ol>"
+    #  cont
+    #end
 
     def render_item_tree_table(itm, level = 1, indx = 0)
       cont = []

data/app/models/smerp/quotation/engine/quotation_item.rb

@@ -8,6 +8,8 @@ module Smerp::Quotation::Engine
 
     acts_as_list
 
+    attr_accessor :sel_qi, :quantum
+
     belongs_to :quotation_product, optional: true
 
     validates_presence_of :name

data/app/models/smerp/quotation/engine/quotation_item_distribution.rb

@@ -0,0 +1,6 @@
+module Smerp::Quotation::Engine
+  class QuotationItemDistribution < Smerp::Quotation::ArModel::QuotationItemDistribution
+
+    validates_presence_of :quotation_item_id, :distributed_quotation_item_id
+  end
+end

data/app/views/smerp/quotation/engine/quotation_item_distributions/_form.html.erb

@@ -0,0 +1,71 @@
+<%= form_with(model: quotation_item_distribution) do |form| %>
+  <% if quotation_item_distribution.errors.any? %>
+    <div style="color: red">
+      <h2><%= pluralize(quotation_item_distribution.errors.count, "error") %> prohibited this quotation_item_distribution from being saved:</h2>
+
+      <ul>
+        <% quotation_item_distribution.errors.each do |error| %>
+          <li><%= error.full_message %></li>
+        <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <h4>Source Quotation Item</h4>
+  <table class="table">
+    <tr>
+      <th>Destination Quotation Item</th>
+      <th>Line Total</th>
+    </tr>
+    <tr>
+      <td><%= @quotation_item.name %></td>
+      <td><%= currency(@quotation_item.line_total) %></td>
+    </tr>
+  </table>
+
+  <%= form.hidden_field :quotation_item_id, value: @quotation_item.id %>
+
+  <h4>Select Destination Quotation Item</h4>
+  <table class="table" id="details">
+
+    <tr>
+      <th width="38%">Name</th>
+      <th class="text-center">Quantity</th>
+      <th class="text-center">Unit</th>
+      <th class="text-end">Unit Price</th>
+      <th class="text-end">Line Total</th>
+      <th width="138px;">&nbsp;</th>
+    </tr>
+
+    <% indx = 0 %>
+    <% @quotation.quotation_items.where(["parent_id is null"]).each do |i| %>
+
+      <% next if i.id == @quotation_item.id %>
+
+      <%= render "quotation_item", quotation_item: i, level: 0, index: indx, f: form %>
+
+      <% indx += 1 %>
+
+      <% iindx = 0 %>
+      <% i.children.each do |c| %>
+        <%= render "quotation_item", quotation_item: c, level: 1, index: iindx, f: form %>
+        <% iindx += 1 %>
+        <%= render_item_tree_table(c, 1, iindx).join.html_safe %>
+      <% end %>
+
+
+    <% end %>
+
+    <tr>
+      <td></td>
+      <td></td>
+      <td></td>
+      <td></td>
+      <td colspan="2" class="text-end"><%= form.submit class: "btn btn-primary" %></td>
+    </tr>
+
+
+  </table>
+
+
+<% end %>

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

@@ -0,0 +1,29 @@
+
+  <tr style="background-color: <%= level_marker(level) %>">
+    <td>
+      <%= (" * " * level).html_safe %>
+      <%= index+1 %>.
+      <%= quotation_item.name %>
+    </td>
+    <td class="text-center"><%= quotation_item.quantity %></td>
+    <td class="text-first"><%= quotation_item.unit %></td>
+    <td class="text-end">
+      <%= currency(quotation_item.unit_price) %>
+    </td>
+    <td class="text-end">
+
+      <% if quotation_item.is_consolidation_destination_item? %>
+        <%= currency(quotation_item.consolidated_line_total) %>
+      <% else %>
+        <%= currency(quotation_item.line_total) %>
+      <% end %>
+
+    </td>
+
+    <td>
+      <%= f.text_field "quantum[#{quotation_item.id}]", multiple: true, class: "form-control text-center" %>
+    </td>
+
+  </tr>
+
+

data/app/views/smerp/quotation/engine/quotation_item_distributions/_quotation_item_distribution.html.erb

@@ -0,0 +1,2 @@
+<div id="<%= dom_id quotation_item_distribution %>">
+</div>

data/app/views/smerp/quotation/engine/quotation_item_distributions/edit.html.erb

@@ -0,0 +1,10 @@
+<h1>Editing quotation item distribution</h1>
+
+<%= render "form", quotation_item_distribution: @quotation_item_distribution %>
+
+<br>
+
+<div>
+  <%= link_to "Show this quotation item distribution", @quotation_item_distribution %> |
+  <%= link_to "Back to quotation item distributions", quotation_item_distributions_path %>
+</div>

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

@@ -0,0 +1,14 @@
+<p style="color: green"><%= notice %></p>
+
+<h1>Quotation item distributions</h1>
+
+<div id="quotation_item_distributions">
+  <% @quotation_item_distributions.each do |quotation_item_distribution| %>
+    <%= render quotation_item_distribution %>
+    <p>
+      <%= link_to "Show this quotation item distribution", quotation_item_distribution %>
+    </p>
+  <% end %>
+</div>
+
+<%= link_to "New quotation item distribution", new_quotation_item_distribution_path %>

data/app/views/smerp/quotation/engine/quotation_item_distributions/new.html.erb

@@ -0,0 +1,9 @@
+<h1>New quotation item distribution</h1>
+
+<%= render "form", quotation_item_distribution: @quotation_item_distribution %>
+
+<br>
+
+<div>
+  <%= link_back quotation_path(@quotation) %>
+</div>

data/app/views/smerp/quotation/engine/quotation_item_distributions/show.html.erb

@@ -0,0 +1,10 @@
+<p style="color: green"><%= notice %></p>
+
+<%= render @quotation_item_distribution %>
+
+<div>
+  <%= link_to "Edit this quotation item distribution", edit_quotation_item_distribution_path(@quotation_item_distribution) %> |
+  <%= link_to "Back to quotation item distributions", quotation_item_distributions_path %>
+
+  <%= button_to "Destroy this quotation item distribution", @quotation_item_distribution, method: :delete %>
+</div>

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

@@ -1,16 +1,33 @@
 <div id="<%= dom_id quotation_item %>">
 
-  <tr>
-    <th><%= quotation_item.name %></th>
-    <td><%= quotation_item.quantity %></td>
-    <td><%= quotation_item.unit %></td>
-    <td><%= currency(quotation_item.unit_price) %></td>
-    <td><%= currency(quotation_item.line_total) %></td>
-    <td><%= currency(quotation_item.discount) %></td>
-    <td><%= currency(quotation_item.line_total_after_discount) %></td>
-    <td><%= currency(quotation_item.tax) %></td>
-    <td><%= currency(quotation_item.line_total_with_tax) %></td>
-    <td></td>
+  <tr style="background-color: <%= level_marker(level) %>">
+    <td>
+      <%= f.check_box :sel_qi, multiple: true %>
+    </td>
+    <td>
+      <%= (" * " * level).html_safe %>
+      <%= index+1 %>.
+      <%= quotation_item.name %>
+    </td>
+    <td class="text-center"><%= quotation_item.quantity %></td>
+    <td class="text-first"><%= quotation_item.unit %></td>
+    <td class="text-end">
+      <%= currency(quotation_item.unit_price) %>
+    </td>
+    <td class="text-end">
+
+      <% if quotation_item.is_consolidation_destination_item? %>
+        <%= currency(quotation_item.consolidated_line_total) %>
+      <% else %>
+        <%= currency(quotation_item.line_total) %>
+      <% end %>
+
+    </td>
+
+    <td>
+      <%= f.text_field :quantum, class: "form-control" %>
+    </td>
+
   </tr>
 
 

data/app/views/smerp/quotation/engine/quotation_items/distribute.html.erb

@@ -0,0 +1,47 @@
+
+<h2>Distribute Quotation Item</h2>
+
+<table class="table" id="details">
+  
+  <tr>
+    <th></th>
+    <th width="38%">Name</th>
+    <th class="text-center">Quantity</th>
+    <th class="text-center">Unit</th>
+    <th class="text-end">Unit Price</th>
+    <th class="text-end">Line Total</th>
+    <th>&nbsp;</th>
+  </tr>
+
+  <%= form_for :quotation_item do |f| %>
+    
+    <% indx = 0 %>
+    <% @quotation.quotation_items.where(["parent_id is null"]).each do |i| %>
+
+      <%= render "quotation_item", quotation_item: i, level: 0, index: indx, f: f %>
+
+      <% indx += 1 %>
+
+      <% iindx = 0 %>
+      <% i.children.each do |c| %>
+        <%= render "quotation_item", quotation_item: c, level: 1, index: iindx, f: f %>
+        <% iindx += 1 %>
+        <%= render_item_tree_table(c, 1, iindx).join.html_safe %>
+      <% end %>
+
+    <% end %>
+
+  <tr>
+    <td></td>
+    <td></td>
+    <td></td>
+    <td></td>
+    <td></td>
+    <td class="text-end"><%= f.submit "Create Distribution", class: "btn btn-primary" %></td>
+    <td></td>
+  </tr>
+
+  <% end %>
+
+</table>
+

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

@@ -1,7 +1,6 @@
 <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,16 +5,13 @@
 <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, cnt: cnt %>
-    <% cnt += 1 %>
+    <%= render quotation_product %>
   <% end %>
   </table>
 </div>

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

@@ -15,6 +15,7 @@
         <%= link_to image_tag('icon-hide.png', size: "20x20"), hide_children_quotation_item_url(quotation_item), data: { turbo_method: :post } %>
         <% end %>
       <% end %>
+      <%= link_to "Distribute", new_quotation_item_distribution_url(source_quotation_item: quotation_item) %>
     </td>
     <td class="text-center"><%= quotation_item.quantity %></td>
     <td class="text-first"><%= quotation_item.unit %></td>
@@ -34,8 +35,17 @@
         <% end %>
       </div>
     </td>
+    
     <td class="text-end">
-      <%= currency(quotation_item.line_total) %>
+
+      <% if quotation_item.is_consolidation_destination_item? %>
+        <%= currency(quotation_item.consolidated_line_total) %>
+      <% elsif quotation_item.is_consolidation_source_item? %>
+        <%= currency(quotation_item.balance_after_distribution[:balance_amount]) %> *
+      <% else %>
+        <%= currency(quotation_item.line_total) %>
+      <% end %>
+
       <div class="collapse" id="dist<%= quotation_item.id %>">
         <%= form_for(:quotation_item, url: apply_discount_quotation_item_path(quotation_item), method: :post) do |f| %>
           <%= f.hidden_field :discount_on, value: :line_total %>
@@ -56,12 +66,28 @@
         <% end %>
       </div>
     </td>
+    
+    <td class="text-end">
+      <% if not quotation_item.is_consolidation_source_item? %>
+        <%= 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? %>
+      (<%= quotation_item.discount.percent_of(quotation_item.line_total,2) %>%)
+      <% end %>
+    </td>
+    
     <td class="text-end">
-      <%= 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" %>
+      <% if not quotation_item.is_consolidation_source_item? %>
+      <%= currency(quotation_item.line_total_after_discount) %>
+      <% end %>
     </td>
-    <td>(<%= quotation_item.discount.percent_of(quotation_item.line_total,2) %>%)</td>
-    <td class="text-end"><%= currency(quotation_item.line_total_after_discount) %></td>
+    
     <td class="text-end">
+
+      <% if not quotation_item.is_consolidation_source_item? %>
       <%= 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| %>
@@ -81,16 +107,63 @@
           </table>
         <% end %>
       </div>
-      
+      <% end  %>
+    </td>
+
+    <td>
+      <% if not quotation_item.is_consolidation_source_item? %>
+      <%= 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? %>
+      <%= currency(quotation_item.line_total_with_tax) %>
+      <% end %>
     </td>
-    <td><%= link_to image_tag('taxfree.png', size: "22x22"), remove_tax_quotation_item_path(quotation_item), data: { turbo_method: "post" } %></td>
-    <td class="text-end"><%= currency(quotation_item.line_total_with_tax) %></td>
+
     <td>
       <%= link_to image_tag('edit.png'), edit_quotation_quotation_item_path(quotation_item.quotation, quotation_item) %>
       <%= link_to image_tag('Delete.png'), quotation_item_path(quotation_item), dataz: { turbo_method: :delete, turbo_confirm: "Delete this item?" } %>
     </td>
   </tr>
 
+
+  <% if quotation_item.is_consolidation_destination_item? %>
+
+    <tr style="background-color: <%= level_marker(level) %>">
+        <td class="text-end" style="font-style: italic"><%= quotation_item.name %> (Existing Value)</td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td class="text-end" style="font-style: italic"><%= currency(quotation_item.line_total) %></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+      </tr>
+    
+      <% quotation_item.source_quotation_items_link.each do |s| %>
+        <% cal = YAML.load(s.distribution_calculations) %>
+      <tr style="background-color: <%= level_marker(level) %>">
+        <td class="text-end" style="font-style: italic">Distributed from : <%= s.quotation_item.name %> </td>
+        <td colspan="3" style="font-style: italic" class="">(<%= distribution_params(cal.params) %> from total <%= currency(s.quotation_item.consolidated_line_total) %>)</td>
+        <td class="text-end" style="font-style: italic"><%= currency(cal.result[Smerp::Quotation::DistributionCalculator::DistributedAmount]) %></td>
+        <td><%= button_to "X", quotation_item_distribution_path(s), method: :delete, class: "btn btn-danger" %></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+      </tr>
+    <% end %>
+  <% end %>
+
+
 </div>
 
 

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

@@ -31,6 +31,9 @@
 <%= link_to "Back", quotations_path, class: "btn btn-secondary" %>
 <%= link_to "Edit", edit_quotation_path(@quotation), class: "btn btn-warning" %>
 <%= link_to "Add/Edit Extended Calculator", extended_calculators_quotation_path(@quotation), class: "btn btn-info" %>
+<div style="clear: left; float: right;" class="text-end">
+  <%= button_to "Delete Quotation", @quotation, method: :delete, class: "btn btn-danger" %>
+</div>
 
 <table class="table">
 

data/config/routes.rb

@@ -1,4 +1,5 @@
 Smerp::Quotation::Engine::Engine.routes.draw do
+  
   resources :quotation_product_categories
   resources :quotation_products
 
@@ -41,9 +42,14 @@ Smerp::Quotation::Engine::Engine.routes.draw do
 
       post :hide_children
       post :show_children
+
+      #resources :quotation_item_distributions #, as: :distribution
+
     end
   end # quotation_items
 
+  resources :quotation_item_distributions #, as: :distribution
+
   resources :quotation_item_groups do
     resources :quotation_items
   end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smerp-quotation-engine
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Ian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-30 00:00:00.000000000 Z
+date: 2022-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -42,72 +42,72 @@ dependencies:
   name: smerp-common
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: ca-data_store
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: ca-data_store-ar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: smerp-quotation
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: devops_assist
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
 description: ''
 email:
 - cameronian0@protonmail.com
@@ -121,12 +121,14 @@ files:
 - app/assets/config/smerp_quotation_engine_manifest.js
 - app/assets/stylesheets/smerp/quotation/engine/application.css
 - app/controllers/smerp/quotation/engine/application_controller.rb
+- app/controllers/smerp/quotation/engine/quotation_item_distributions_controller.rb
 - app/controllers/smerp/quotation/engine/quotation_item_groups_controller.rb
 - app/controllers/smerp/quotation/engine/quotation_items_controller.rb
 - app/controllers/smerp/quotation/engine/quotation_product_categories_controller.rb
 - app/controllers/smerp/quotation/engine/quotation_products_controller.rb
 - app/controllers/smerp/quotation/engine/quotations_controller.rb
 - app/helpers/smerp/quotation/engine/application_helper.rb
+- app/helpers/smerp/quotation/engine/quotation_item_distributions_helper.rb
 - app/helpers/smerp/quotation/engine/quotation_item_groups_helper.rb
 - app/helpers/smerp/quotation/engine/quotation_items_helper.rb
 - app/helpers/smerp/quotation/engine/quotation_product_categories_helper.rb
@@ -137,12 +139,19 @@ files:
 - app/models/smerp/quotation/engine/application_record.rb
 - app/models/smerp/quotation/engine/quotation.rb
 - app/models/smerp/quotation/engine/quotation_item.rb
+- app/models/smerp/quotation/engine/quotation_item_distribution.rb
 - app/models/smerp/quotation/engine/quotation_item_group.rb
 - app/models/smerp/quotation/engine/quotation_product.rb
 - app/models/smerp/quotation/engine/quotation_product_category.rb
 - app/views/layouts/smerp/quotation/engine/application.html.erb
-- app/views/smerp/quotation/engine/_new_quotation_item_form.html.erb
 - app/views/smerp/quotation/engine/extended_calculators/extended_calculators.html.erb
+- app/views/smerp/quotation/engine/quotation_item_distributions/_form.html.erb
+- app/views/smerp/quotation/engine/quotation_item_distributions/_quotation_item.html.erb
+- app/views/smerp/quotation/engine/quotation_item_distributions/_quotation_item_distribution.html.erb
+- app/views/smerp/quotation/engine/quotation_item_distributions/edit.html.erb
+- app/views/smerp/quotation/engine/quotation_item_distributions/index.html.erb
+- app/views/smerp/quotation/engine/quotation_item_distributions/new.html.erb
+- app/views/smerp/quotation/engine/quotation_item_distributions/show.html.erb
 - app/views/smerp/quotation/engine/quotation_item_groups/_form.html.erb
 - app/views/smerp/quotation/engine/quotation_item_groups/_quotation_item_group.html.erb
 - app/views/smerp/quotation/engine/quotation_item_groups/edit.html.erb
@@ -152,6 +161,7 @@ files:
 - app/views/smerp/quotation/engine/quotation_items/_form.html.erb
 - app/views/smerp/quotation/engine/quotation_items/_product_item_form.html.erb
 - app/views/smerp/quotation/engine/quotation_items/_quotation_item.html.erb
+- app/views/smerp/quotation/engine/quotation_items/distribute.html.erb
 - app/views/smerp/quotation/engine/quotation_items/edit.html.erb
 - app/views/smerp/quotation/engine/quotation_items/index.html.erb
 - app/views/smerp/quotation/engine/quotation_items/new.html.erb

data/app/views/smerp/quotation/engine/_new_quotation_item_form.html.erb

@@ -1,48 +0,0 @@
-
-
-<% parent = (defined?(group).nil? ? @quotation : group) %>
-<% url = (defined?(group).nil? ? quotation_quotation_items_path(@quotation) : quotation_item_group_quotation_items_path(group)) %>
-
-<%= form_with(model: @qi, url: url, method: :post) do |f| %>
-    <% if @qi.errors.any? %>
-    <div style="color: red">
-      <h2><%= pluralize(@qi.errors.count, "error") %> prohibited this quotation_item from being saved:</h2>
-
-      <ul>
-        <% @qi.errors.each do |error| %>
-          <li><%= error.full_message %></li>
-        <% end %>
-      </ul>
-    </div>
-  <% end %>
-
-  <% if not defined?(group).nil? %>
-    <%= f.hidden_field :quotation_item_group_id, value: group.id %>
-  <% else %>
-    <%= f.hidden_field :quotation_id, value: @quotation.id %>
-  <% end %>
-
-  <div class="row pb-1">
-    <div class="col-10">
-      <%= f.select :parent_is, @parent, {}, class: "form-control"  %>
-    </div>
-  </div>
-
-<div class="row pb-1">
-  <div class="col-6"><%= f.text_field :name, placeholder: (defined?(group).nil?) ? "Item" : "Sub Item Under Group #{group.name}", class: "form-control" %></div>
-  <div class="col-1"><%= f.text_field :quantity, placeholder: "Quantity", class: "form-control" %></div>
-  <div class="col-1"><%= f.text_field :unit, placeholder: "Unit", class: "form-control" %></div>
-  <div class="col-1"><%= f.text_field :unit_price, placeholder: "Unit Price", class: "form-control" %></div>
-  <div class="col-1">
-    <%= f.text_field :discount, placeholder: "Discount", class: "form-control" %>
-    <%= f.select :discount_unit, [["Percent","percent"],["Value","value"]], {}, class: "form-control" %>
-  </div>
-  <div class="col-1">
-    <%= f.text_field :tax, placeholder: "Tax", class: "form-control" %>
-    <%= f.select :tax_unit, [["Percent","percent"],["Value","value"]], {}, class: "form-control" %>
-  </div>
-  <div class="col-1"><%= f.submit "Create" %></div>
-</div>
-
-<% end %>
-