solidus_subscription_boxes 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7f6bff4c234fb7b885dde2d9ac3e516776602a8
-  data.tar.gz: cdfad1c66c819b74ebc9679aa39043c162b3053a
+  metadata.gz: 777198967dcf84fbc05e24af7413e926c0d4f4e9
+  data.tar.gz: d433bbcd05a1b4c8ed33d264c750bfa91be67327
 SHA512:
-  metadata.gz: 409869b545c2e810c654e450128a985804ccdd31c058f6703c5fc022a959bea80d72d330356dad8553fd9d3831522cc2575365d0f8182bfcf1e4b7b150b4cc47
-  data.tar.gz: b2575ae580195b6cd9a51c007846cfdefd0c9dbc89d603f1da04f35f317a558b9bc7be3f835407fa80e05d77e73cdd8a0a32f30aba12eec94ab40b4066cc3fd1
+  metadata.gz: 8326e926d6e118e57381bcf25069eda78b5671b14b3d7671832fce17fa5757dbd5f03a1e34b17823882be9b215aab709dd422c17588bd407365af10fd2c04376
+  data.tar.gz: e983251c8b6481b0d951428f4000726c8b464347819a9c757d26c395a57342a2927964bc59a9094ba1c7f832f6d93aba2f8debb0772b0a617eb177f168c051a1

data/app/assets/javascripts/solidus_subscription_boxes/subscription_selection.js

@@ -13,29 +13,39 @@ function subscriptionFormatDate(date) {
   return monthNames[monthIndex] + ' ' + day;
 }
 
+$('.box-controls i').click(function(event) {
+  var value = parseInt($(this).siblings('input').val());
+  if(this.classList.contains('add')) {
+    value = Math.min(value + 1, 9);
+  } else {
+    value = Math.max(value - 1, 0);
+  }
+  $(this).siblings('input').val(value);
+
+
+  var numberOfMeals = function() {
+    var total = 0;
+    $('.box-controls input').each( function(element) {
+      total = total + parseInt(this.value);
+    });
+    return total;
+  }
 
-$('.meal-selection').click( function(event) {
   if( $('body.get_started').length > 0 ) {
     var submitButtonText = "Subscribe Now";
   } else {
     var submitButtonText = "Update My Order";
   }
 
-  if( $('.meal-selection input:checked').length > 3 ) {
-    alert("Only choose 3 meals");
-    event.target.checked = false;
-    event.preventDefault();
-  }
-
-  if( $('.meal-selection input:checked').length == 3 ) {
+  if( numberOfMeals() >= 3 ) {
     $('input[type=submit].meal-update').removeAttr('disabled');
     $('input[type=submit].meal-update').attr("value",submitButtonText);
   } else {
     $('input[type=submit].meal-update').attr("disabled","disabled");
-    $('input[type=submit].meal-update').attr("value","Choose " + (3 - $('.meal-selection input:checked').length).toString() + " More");
+    $('input[type=submit].meal-update').attr("value","Choose " + (Math.max(3 - numberOfMeals(), 0)).toString() + " More");
   }
 
-  $('.number_more_meals').text(3 - $('.meal-selection input:checked').length);
+  $('.number_more_meals').text(3 - numberOfMeals());
 });
 
 $(document).ajaxSuccess(function( event, xhr, settings ) {

data/app/assets/stylesheets/solidus_subscription_boxes/subscription_box.css.scss

@@ -20,15 +20,10 @@
 .flash.success {
   background-color: green;
 }
-.meal-selector .meal-selection,  {
-  .image {
-    border: 3px transparent solid;
-    cursor: pointer;
-    &:hover {
-      border: 3px $gray-500 solid;
-    }
-  }
-  input:checked + .image {
-    border: 3px $btn-box-shadow-color solid;
-  }
-}
+.meal-selector input{
+  width: 100px;
+}
+.box-controls i {
+  cursor: pointer;
+}
+

data/app/decorators/spree/controllers/orders/meal_preference_decorator.rb

@@ -14,6 +14,12 @@ module Spree
           if params[:box_preference_attributes]
             params[:box_preference_attributes].permit!
             @order.update_attributes(box_preference_attributes: params[:box_preference_attributes].to_hash)
+            @order.box_preference.preference.each do |key, value|
+              if value.to_i > 0 then
+                variant = Spree::Variant.find(key.to_i)
+                @order.contents.add(variant, value.to_i)
+              end
+            end
           end
         end
       end

data/app/decorators/spree/controllers/users/set_box_preference_decorator.rb

@@ -19,7 +19,8 @@ module Spree
 
           must_change_subscriptions.each do |subscription|
             potential_variants = SolidusSubscriptionBoxes::SubscriptionPeriod.period_for_date(subscription.actionable_date).variants
-            subscription.box_preference = SolidusSubscriptionBoxes::BoxPreference.new(preference: potential_variants.sample(3).map(&:id))
+            selected_preferences = Hash[potential_variants.sample(3).collect { |variant| [variant.id.to_s, 1.to_s] } ]
+            subscription.box_preference = SolidusSubscriptionBoxes::BoxPreference.new(preference: selected_preferences)
           end
         end
       end

data/app/helpers/solidus_subscription_boxes/application_helper.rb

@@ -7,5 +7,13 @@ module SolidusSubscriptionBoxes
         ""
       end
     end
+
+    def preferable_value(box_preference, variant_id)
+      if box_preference.present?
+        box_preference.preference.fetch(variant_id.to_s){ 0 }
+      else
+        0
+      end
+    end
   end
 end

data/app/models/solidus_subscription_boxes/box_preference.rb

@@ -1,7 +1,7 @@
 module SolidusSubscriptionBoxes
   class BoxPreference < ApplicationRecord
     belongs_to :preferable, polymorphic: true
-    serialize :preference, Array
+    serialize :preference, Hash
 
     def variants
       Spree::Variant.where(id: preference.map(&:to_i))

data/app/views/solidus_subscription_boxes/subscription_boxes/_box_variants.html.erb

@@ -1,13 +1,15 @@
 <div class="meal-selector row row-centered">
   <%- box_variants.each do |variant| %>
     <div class="col-xs-12 col-md-4 col-centered text-center meal">
-      <label class="meal-selection">
-        <input class="d-none" type="checkbox" name="<%= preference_scope %>" value="<%= variant.id %>" <%= is_checked(preferable, variant) %>>
-        <div class="image">
-          <%= image_tag variant.display_image.attachment.url(:large) %>
-          <h4><%= variant.name %></h4>
-        </div>
-      </label>
+      <div class="image">
+        <%= image_tag variant.display_image.attachment.url(:large) %>
+        <h4><%= variant.name %></h4>
+      </div>
+      <div class="box-controls display-4">
+        <i class="fa fa-3 fa-minus-circle remove" aria-hidden="true"></i>
+        <input class="border-0 col-4 text-right" type="number" name="<%= preference_scope %>[<%= variant.id %>]" value="<%= preferable_value(preferable.box_preference, variant.id) %>" readonly>
+        <i class="fa fa-3 fa-plus-circle add" aria-hidden="true"></i>
+      </div>
     </div>
   <% end %>
 </div>

data/app/views/solidus_subscription_boxes/subscription_boxes/_manage.html.erb

@@ -8,7 +8,7 @@
           <%= render partial: 'solidus_subscription_boxes/subscription_boxes/box_variants',
             locals: {
               box_variants: SolidusSubscriptionBoxes::SubscriptionPeriod.period_for_date(subscription.actionable_date).variants,
-              preference_scope: "subscription[box_preference_attributes][preference][]",
+              preference_scope: "subscription[box_preference_attributes][preference]",
               preferable: subscription
             }
           %>

data/app/views/solidus_subscription_boxes/subscription_boxes/get_started.html.erb

@@ -34,7 +34,7 @@
   <h4 class="text-center">We update the menu seasonally to use the freshest ingredients</h4>
   <div class="pt-5">
     <%= form_for :order, url: '/orders/populate' do |f| %>
-      <%= render partial: 'box_variants', locals: {box_variants: @box_variants, preference_scope: "box_preference_attributes[preference][]", preferable: f.object} %>
+      <%= render partial: 'box_variants', locals: {box_variants: @box_variants, preference_scope: "box_preference_attributes[preference]", preferable: f.object} %>
       <div class="row mt-5">
         <div class="col-12 content text-center">
           <%= hidden_field_tag :variant_id,  @variant.id %>

data/lib/solidus_subscription_boxes/version.rb

@@ -1,3 +1,3 @@
 module SolidusSubscriptionBoxes
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_subscription_boxes
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Joel Jackson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-03 00:00:00.000000000 Z
+date: 2017-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus