caboose-cms 0.8.41 → 0.8.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 945c437e933d397c1638c61f648474f9144bfaa5
-  data.tar.gz: 32696496ae665b5937f15cb846227c5db9ad4df9
+  metadata.gz: a2076b0bc20624465ba131782399551802f7cf86
+  data.tar.gz: 52d9bcde7f99280c503324b0263d9d0160c9873a
 SHA512:
-  metadata.gz: 2d9873f6add7c68e6bc4c398c9cf7849e824f9dc285dcd1cd8a1fbcd4a54b5d2cd67b3c6aaee813f7cc23e90a29a1288604fdc5bfcc1771609727db90e6f30f0
-  data.tar.gz: 9f8b80d544fb73d64a31fd18e89d7f3683e64493ff535cf27a5c3ed8667b0ad24a6c3248d0c7660bff5a1a6136abe88a2c2fc39695786545f55add7d85403dd3
+  metadata.gz: 94899604fdbb18235561cbb3c4c73536ade2eaef9f2011e3d64d85a5ff3a184747cf96f018d3de325012cc2df2cba9fa2ea6404e2239dc891d381749d0093504
+  data.tar.gz: de8e7140f72583285126504ce04239bb0507c2f7ac54c840a0ee75943204474c3d59a3c3384d2685f382c3b1d11a6197b5b4905b4564e05b5c0bd552a2ba21ec

data/app/assets/javascripts/caboose/modal_integration.js

@@ -50,8 +50,7 @@ $(document).ready(function() {
 
 function caboose_modal(el)
 {
-  var options = { 
-    iframe: true, 
+  var options = {      
     initialWidth: 400, 
     initialHeight: 200, 
     innerWidth: 400, 

data/app/models/caboose/schema.rb

@@ -869,6 +869,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :subscription_id  , :integer ],
         [ :user_id          , :integer ],
         [ :date_started     , :date    ],
+        [ :date_started_full, :date    ],
         [ :status           , :string  ]
       ],
       Caboose::Variant => [

data/app/models/caboose/user_subscription.rb

@@ -28,10 +28,10 @@ module Caboose
       s = self.subscription
       d = nil
       if s.interval == Subscription::INTERVAL_YEARLY        
-        d = Date(self.date_started.year, s.start_month, s.start_day)
+        d = Date.parse(self.date_started.year, s.start_month, s.start_day)
         d = d + 1.year if d < self.date_started        
       elsif s.interval == Subscription::INTERVAL_MONTHLY        
-        d = Date(self.date_started.year, self.date_started.month, s.start_day)
+        d = Date.parse(self.date_started.year, self.date_started.month, s.start_day)
         d = d + 1.month if d < self.date_started                
       end
       self.date_started_full = d
@@ -57,7 +57,7 @@ module Caboose
       unit_price = v.clearance && v.clearance_price ? v.clearance_price : (v.on_sale? ? v.sale_price : v.price)
       
       # Special case if the subscription starts on specific day
-      if self.subscription.start_on_day && Date.today > self.date_started_full
+      if self.subscription.start_on_day && (Date.today > self.date_started_full)
         li = self.line_items.where("date_starts = ? date_ends = ?", self.date_started, self.date_started_full - 1.day).first
         if li.nil?
           prorated_unit_price = unit_price + 0.00          

data/app/views/caboose/login_mailer/forgot_password_email.html.erb

@@ -2,7 +2,7 @@
 <%
 site = @user.site
 pd = site.primary_domain
-url = "#{pd.domain}/modal/login/reset-password/#{@user.password_reset_id}"
+url = "#{pd.domain}/login/reset-password/#{@user.password_reset_id}"
 %>
 <p>To reset your password for <%= site.description %>, click the link below:</p>
 <p><a href='<%= url %>'><%= url %></p>

data/app/views/caboose/my_account/index.html.erb

@@ -1,5 +1,5 @@
 <%
-store_config = @invoice.site.store_config
+store_config = @invoice.site.store_config if @invoice
 u = @logged_in_user
 %>
 <div id='my_account'>
@@ -10,7 +10,7 @@ u = @logged_in_user
   <p><div id='user_<%= @user.id %>_phone'      ></div></p>
   <div id='message2'></div>
 
-  <% if @site.use_store %>
+  <% if @site.use_store && store_config %>
     <h2>Billing</h2>
     <p id='card_details'>
       <% if u.card_brand && u.card_last4 %>You have a <%= u.card_brand %> ending in <%= u.card_last4 %> on file.<% else %>You have no card on file.<% end %>
@@ -29,7 +29,7 @@ u = @logged_in_user
 
   <p>
     <input type='button' value='Reset Password' class='btn' onclick="reset_user_password();" />
-    <% if @site.use_store %>    
+    <% if @site.use_store && store_config %>    
       <input type='button' value='Invoice History' class='btn' onclick="window.location='/my-account/invoices';" />
     <% end %>
   </p>
@@ -62,7 +62,7 @@ $(document).ready(function() {
     }
   });
   
-  <% if @site.use_store %>
+  <% if @site.use_store && store_config %>
     $('#stripe_form').submit(function(e) {
       e.preventDefault();
       update_card();
@@ -76,7 +76,7 @@ $(document).ready(function() {
   <% end %>
 });
 
-<% if @site.use_store %>
+<% if @site.use_store && store_config %>
 function toggle_stripe_form()
 {
   if ($('#stripe_form').is(':visible'))

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.8.41'
+  VERSION = '0.8.42'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.8.41
+  version: 0.8.42
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-11 00:00:00.000000000 Z
+date: 2016-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg