Change calculation payment_total

CHANGELOG.md

@@ -1,4 +1,6 @@
 ## Solidus 2.1.0 (master, unreleased)
+*   Prototypes were removed from the admin; the extension `solidus_prototype`
+    provides the same functionality
 
 *   Remove `currency` from line items.
 
@@ -238,7 +240,7 @@
 
     https://github.com/solidusio/solidus/pull/904
 
-    In order to convert your historical shipping rate taxation data, please run  
+    In order to convert your historical shipping rate taxation data, please run
     `rake solidus:upgrade:one_point_three` - this will create persisted taxation notes
     for historical shipping rates. Be aware though that these taxation notes are
     estimations and should not be used for accounting purposes.

api/app/controllers/spree/api/taxons_controller.rb

@@ -66,6 +66,17 @@ def products
         # Products#index does not do the sorting.
         taxon = Spree::Taxon.find(params[:id])
         @products = paginate(taxon.products.ransack(params[:q]).result)
+        @products = @products.includes(master: :default_price)
+
+        if params[:simple]
+          @exclude_data = {
+            variants: true,
+            option_types: true,
+            product_properties: true,
+            classifications: true
+          }
+          @product_attributes = %i(id name display_price)
+        end
         render "spree/api/products/index"
       end
 

api/app/views/spree/api/products/index.v1.rabl

@@ -1,5 +1,5 @@
 object false
-node(:count) { @products.count }
+node(:count) { @products.size }
 node(:total_count) { @products.total_count }
 node(:current_page) { @products.current_page }
 node(:per_page) { @products.limit_value }

api/app/views/spree/api/products/show.v1.rabl

@@ -1,31 +1,42 @@
 object @product
 cache [I18n.locale, @current_user_roles.include?('admin'), current_pricing_options, root_object]
 
-attributes *product_attributes
+@product_attributes ||= product_attributes
+attributes(*@product_attributes)
 
 node(:display_price) { |p| p.display_price.to_s }
-node(:has_variants) { |p| p.has_variants? }
 
-child :master => :master do
-  extends "spree/api/variants/small"
-end
+@exclude_data ||= {}
+unless @exclude_data[:variants]
+  node(:has_variants) { |p| p.has_variants? }
+
+  child :master => :master do
+    extends "spree/api/variants/small"
+  end
 
-child :variants => :variants do
-  extends "spree/api/variants/small"
+  child :variants => :variants do
+    extends "spree/api/variants/small"
+  end
 end
 
-child :option_types => :option_types do
-  attributes *option_type_attributes
+unless @exclude_data[:option_types]
+  child :option_types => :option_types do
+    attributes(*option_type_attributes)
+  end
 end
 
-child :product_properties => :product_properties do
-  attributes *product_property_attributes
+unless @exclude_data[:product_properties]
+  child :product_properties => :product_properties do
+    attributes(*product_property_attributes)
+  end
 end
 
-child :classifications => :classifications do
-  attributes :taxon_id, :position
+unless @exclude_data[:classifications]
+  child :classifications => :classifications do
+    attributes :taxon_id, :position
 
-  child(:taxon) do
-    extends "spree/api/taxons/show"
+    child(:taxon) do
+      extends "spree/api/taxons/show"
+    end
   end
 end

backend/app/assets/javascripts/spree/backend/taxons.js.coffee

@@ -68,6 +68,6 @@ $ ->
   $('#taxon_id').on "change", (e) ->
     Spree.ajax
       url: Spree.routes.taxon_products_api,
-      data: { id: e.val }
+      data: { id: e.val, simple: 1 }
       success: (data) ->
         sortable.html productListTemplate(data.products)

backend/app/controllers/spree/admin/products_controller.rb

@@ -4,7 +4,6 @@ class ProductsController < ResourceController
       helper 'spree/products'
 
       before_action :load_data, except: [:index]
-      create.before :create_before
       update.before :update_before
       helper_method :clone_object_url
 
@@ -115,11 +114,6 @@ def collection
         @collection
       end
 
-      def create_before
-        return if params[:product][:prototype_id].blank?
-        @prototype = Spree::Prototype.find(params[:product][:prototype_id])
-      end
-
       def update_before
         # note: we only reset the product properties if we're receiving a post
         #       from the form on that tab

backend/app/models/spree/backend_configuration.rb

@@ -5,7 +5,7 @@ class BackendConfiguration < Preferences::Configuration
     ORDER_TABS         ||= [:orders, :payments, :creditcard_payments,
                             :shipments, :credit_cards, :return_authorizations,
                             :customer_returns, :adjustments, :customer_details]
-    PRODUCT_TABS       ||= [:products, :option_types, :properties, :prototypes,
+    PRODUCT_TABS       ||= [:products, :option_types, :properties,
                             :variants, :product_properties, :taxonomies,
                             :taxons]
     REPORT_TABS        ||= [:reports]

backend/app/views/spree/admin/product_properties/index.html.erb

@@ -9,11 +9,6 @@
       <li>
         <%= link_to_add_fields Spree.t(:add_product_properties), 'tbody#product_properties', :class => 'plus button' %>
       </li>
-      <li>
-        <span id="new_ptype_link">
-          <%= link_to Spree.t(:select_from_prototype), available_admin_prototypes_url, :remote => true, :class => 'button fa fa-copy' %>
-        </span>
-      </li>
     </ul>
   <% end %>
 <% end %>
@@ -23,8 +18,6 @@
     <legend align="center"><%= plural_resource_name(Spree::ProductProperty) %></legend>
     <div class="add_product_properties" data-hook="add_product_properties"></div>
 
-    <div id="prototypes" data-hook></div>
-
     <table class="index sortable" data-hook data-sortable-link="<%= update_positions_admin_product_product_properties_url %>">
       <thead>
         <tr data-hook="product_properties_header">

backend/app/views/spree/admin/products/_form.html.erb

@@ -38,7 +38,7 @@
       </div>
 
       <% if show_rebuild_vat_checkbox? %>
-        <%= render "spree/admin/shared/rebuild_vat_prices_checkbox", form: f, model_name: "product"%>
+        <%= render "spree/admin/shared/rebuild_vat_prices_checkbox", form: f, model_name: "product" %>
         <div class="clearfix"></div>
       <% end %>
 

backend/app/views/spree/admin/products/new.html.erb

@@ -23,13 +23,6 @@
         </div>
       <% end %>
 
-      <div data-hook="new_product_prototype" class="col-xs-3">
-        <%= f.field_container :prototype do %>
-          <%= f.label :prototype_id, Spree::Prototype.model_name.human %><br />
-          <%= f.collection_select :prototype_id, Spree::Prototype.all, :id, :name, {:include_blank => true}, {:class => 'select2 fullwidth'} %>
-        <% end %>
-      </div>
-
       <div data-hook="new_product_price" class="col-xs-3">
         <%= f.field_container :price do %>
           <%= f.label :price, class: 'required' %><br />
@@ -69,33 +62,7 @@
       </div>
     </div>
 
-    <div class="clearfix" data-hook="product-from-prototype" id="product-from-prototype">
-      <%= render :file => 'spree/admin/prototypes/show' if @prototype %>
-    </div>
-
     <%= render :partial => 'spree/admin/shared/new_resource_links' %>
 
   </fieldset>
 <% end %>
-
-<script type="text/javascript">
-//<![CDATA[
-  (function($){
-    var base_url = "<%= admin_prototypes_url %>";
-    var prototype_select = $('#product_prototype_id');
-    prototype_select.change(function() {
-      var id = prototype_select.val();
-      if (id.length) {
-        var url = new Uri(base_url);
-        url.setPath(url.path() + '/' + id);
-        $('#product-from-prototype').load(url.toString());
-      } else {
-        $('#product-from-prototype').empty();
-      }
-    })
-    if (prototype_select.html() == "") {
-      prototype_select.change();
-    }
-  })(jQuery);
-//]]>
-</script>