caboose-cms 0.8.43 → 0.8.44

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

@@ -0,0 +1,191 @@
+<%
+store_config = @invoice.site.store_config if @invoice
+u = @logged_in_user
+%>
+<div id='my_account'>
+  <h1>My Account</h1>
+  <p><div id='user_<%= @user.id %>_first_name' ></div></p>
+  <p><div id='user_<%= @user.id %>_last_name'  ></div></p>
+  <p><div id='user_<%= @user.id %>_email'      ></div></p>
+  <p><div id='user_<%= @user.id %>_phone'      ></div></p>
+  <div id='message2'></div>
+
+  <% 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 %>
+      <a href='#' onclick="toggle_stripe_form();" />edit</a>
+    </p>
+    <form action='' method='post' id='stripe_form' class='stripe_form'>               
+      <div class='card_number_container'><input id='card_number' type='tel'  autocomplete='off' autocorrect='off' spellcheck='off' autocapitalize='off' placeholder='Card number'                                                  /><div class='svg icon' style='width:30px;height:30px'><svg version="1.1" viewBox="0 0 30 30" width="30" height="30" focusable="false"><g fill-rule="evenodd"><path d="M2.00585866,0 C0.898053512,0 0,0.900176167 0,1.99201702 L0,9.00798298 C0,10.1081436 0.897060126,11 2.00585866,11 L11.9941413,11 C13.1019465,11 14,10.0998238 14,9.00798298 L14,1.99201702 C14,0.891856397 13.1029399,0 11.9941413,0 L2.00585866,0 Z M2.00247329,1 C1.44882258,1 1,1.4463114 1,1.99754465 L1,9.00245535 C1,9.55338405 1.45576096,10 2.00247329,10 L11.9975267,10 C12.5511774,10 13,9.5536886 13,9.00245535 L13,1.99754465 C13,1.44661595 12.544239,1 11.9975267,1 L2.00247329,1 Z M1,3 L1,5 L13,5 L13,3 L1,3 Z M11,8 L11,9 L12,9 L12,8 L11,8 Z M9,8 L9,9 L10,9 L10,8 L9,8 Z M9,8" style="fill:#3b6faa" transform="translate(8,10)"></g></svg></div></div>
+      <div class='card_exp_container'   ><input id='card_exp'    type='tel'  autocomplete='off' autocorrect='off' spellcheck='off' autocapitalize='off' placeholder='MM / YY'      x-autocompletetype='off' autocompletetype'=off' /><div class='svg icon' style='width:30px;height:30px'><svg version="1.1" viewBox="0 0 30 30" width="30" height="30" focusable="false"><g fill-rule="evenodd"><path d="M2.0085302,1 C0.899249601,1 0,1.90017617 0,2.99201702 L0,10.007983 C0,11.1081436 0.901950359,12 2.0085302,12 L9.9914698,12 C11.1007504,12 12,11.0998238 12,10.007983 L12,2.99201702 C12,1.8918564 11.0980496,1 9.9914698,1 L2.0085302,1 Z M1.99539757,4 C1.44565467,4 1,4.43788135 1,5.00292933 L1,9.99707067 C1,10.5509732 1.4556644,11 1.99539757,11 L10.0046024,11 C10.5543453,11 11,10.5621186 11,9.99707067 L11,5.00292933 C11,4.44902676 10.5443356,4 10.0046024,4 L1.99539757,4 Z M3,1 L3,2 L4,2 L4,1 L3,1 Z M8,1 L8,2 L9,2 L9,1 L8,1 Z M3,0 L3,1 L4,1 L4,0 L3,0 Z M8,0 L8,1 L9,1 L9,0 L8,0 Z M8,0" style="fill:#3b6faa" transform="translate(8,9)"></g></svg></div></div>
+      <div class='card_cvc_container'   ><input id='card_cvc'    type='tel'  autocomplete='off' autocorrect='off' spellcheck='off' autocapitalize='off' placeholder='CVC'          maxlength='4'                                   /><div class='svg icon' style='width:30px;height:30px'><svg version="1.1" viewBox="0 0 30 30" width="30" height="30" focusable="false"><g fill-rule="evenodd"><path d="M8.8,4 C8.8,1.79086089 7.76640339,4.18628304e-07 5.5,0 C3.23359661,-4.1480896e-07 2.2,1.79086089 2.2,4 L3.2,4 C3.2,2.34314567 3.81102123,0.999999681 5.5,1 C7.18897877,1.00000032 7.80000001,2.34314567 7.80000001,4 L8.8,4 Z M1.99201702,4 C0.891856397,4 0,4.88670635 0,5.99810135 L0,10.0018986 C0,11.1054196 0.900176167,12 1.99201702,12 L9.00798298,12 C10.1081436,12 11,11.1132936 11,10.0018986 L11,5.99810135 C11,4.89458045 10.0998238,4 9.00798298,4 L1.99201702,4 Z M1.99754465,5 C1.44661595,5 1,5.45097518 1,5.99077797 L1,10.009222 C1,10.5564136 1.4463114,11 1.99754465,11 L9.00245535,11 C9.55338405,11 10,10.5490248 10,10.009222 L10,5.99077797 C10,5.44358641 9.5536886,5 9.00245535,5 L1.99754465,5 Z M1.99754465,5" style="fill:#3b6faa" transform="translate(9,9)"></g></svg></div></div>
+      <div class='card_name_container'  ><input id='card_name'   type='text' autocomplete='off' autocorrect='off' spellcheck='off' autocapitalize='on'  placeholder='Name on card' /></div>
+      <div class='card_zip_container'   ><input id='card_zip'    type='tel'  autocomplete='off' autocorrect='off' spellcheck='off' autocapitalize='on'  placeholder='Zip code'     /></div>
+      <div id='message'></div>  
+      <p class='payment_controls'><input type='submit' class='btn' id='save_payment_btn'   value='Save' /></p>
+    </form>
+  <% end %>
+
+  <p>
+    <input type='button' value='Reset Password' class='btn' onclick="reset_user_password();" />
+    <% if @site.use_store && store_config %>    
+      <input type='button' value='Invoice History' class='btn' onclick="window.location='/my-account/invoices';" />
+    <% end %>
+  </p>
+</div>
+
+<% content_for :caboose_js do %>
+<%= javascript_include_tag 'https://js.stripe.com/v2/' %>
+<%= javascript_include_tag 'caboose/model/all' %>
+<%= javascript_include_tag 'caboose/united_states' %>
+<%= javascript_include_tag 'caboose/jquery.payment' %>
+<script type='text/javascript'>
+
+$(document).ready(function() {
+  new ModelBinder({
+    name: 'User',
+    id: <%= @user.id %>,
+    update_url: '/my-account',
+    authenticity_token: '<%= form_authenticity_token %>',
+    attributes: [
+      { name: 'first_name' , nice_name: 'First name'   , type: 'text', value: <%= raw Caboose.json(@user.first_name) %>, width: 400 },
+      { name: 'last_name'  , nice_name: 'Last name'    , type: 'text', value: <%= raw Caboose.json(@user.last_name)  %>, width: 400 },      
+      { name: 'email'      , nice_name: 'Email'        , type: 'text', value: <%= raw Caboose.json(@user.email)      %>, width: 400 },
+      { name: 'phone'      , nice_name: 'Phone Number' , type: 'text', value: <%= raw Caboose.json(@user.phone)      %>, width: 400 }
+    ],
+    on_load: function() {
+      $('#user_<%= @user.id %>_first_name').css('width', '400px');
+      $('#user_<%= @user.id %>_last_name' ).css('width', '400px');
+      $('#user_<%= @user.id %>_email'     ).css('width', '400px');
+      $('#user_<%= @user.id %>_phone'     ).css('width', '400px');    
+    }
+  });
+  
+  <% if @site.use_store && store_config %>
+    $('#stripe_form').submit(function(e) {
+      e.preventDefault();
+      update_card();
+      return false;
+    });
+      
+    $('#stripe_form .card_number_container input').payment('formatCardNumber');
+    $('#stripe_form .card_exp_container    input').payment('formatCardExpiry');
+    $('#stripe_form .card_cvc_container    input').payment('formatCardCVC');  
+    $('#stripe_form').hide();
+  <% end %>
+});
+
+<% if @site.use_store && store_config %>
+function toggle_stripe_form()
+{
+  if ($('#stripe_form').is(':visible'))
+    $('#stripe_form').hide();
+  else
+    $('#stripe_form').show();      
+}
+
+function update_card()
+{                  
+  var info = {
+    number:      $('#card_number').val(),
+    exp:         $('#card_exp').val(),
+    cvc:         $('#card_cvc').val(),
+    name:        $('card_name').val(),
+    address_zip: $('card_zip').val()
+  };
+  var exp = info.exp.split('/');
+  var m = exp.length > 0 ? exp[0] : '';
+  var y = exp.length > 1 ? exp[1] : '';        
+  var error = false;
+  if (!$.payment.validateCardNumber(info.number)) error = "Invalid card number.";
+  if (!$.payment.validateCardExpiry(m, y))        error = "Invalid expiration date.";
+  if (!$.payment.validateCardCVC(info.cvc))       error = "Invalid CVC.";
+  if (error) { $('#message').html("<p class='note error'>" + error + "</p>"); return; }
+      
+  $('#save_payment_btn').attr('disabled', 'true').val('Saving card...');    
+  Stripe.setPublishableKey(<%= raw Caboose.json(store_config.stripe_publishable_key) %>);    
+  Stripe.card.createToken(info, function(status, resp) {
+    if (resp.error)
+    {
+      $('#save_payment_btn').attr('disabled', 'false').val('Save Payment Method');    
+      $('#message').html("<p class='note error'>" + resp.error.message + "</p>");
+    }      
+    else
+    {                                      
+      $.ajax({
+        url: '/checkout/stripe-details',
+        type: 'put',
+        data: { token: resp.id, card: resp.card },
+        success: function(resp2) {
+          if (resp2.error) $('#payment_message').html("<p class='note error'>" + resp2.error + "</p>");
+          if (resp2.success) window.location.reload(true);
+        }
+      });
+    }
+  });  
+}
+<% end %>
+
+function reset_user_password(pass1, pass2)
+{
+  if (!pass1)
+  {
+    var p = $('<p/>').addClass('note warning')
+      .append("Please enter your password:<br /><br />")
+      .append($('<input/>').attr('type', 'password').attr('id', 'pass1').css('width', '200px')).append(' ')
+      .append($('<input/>').attr('type', 'button').val('Continue').click(function(e) { reset_user_password($('#pass1').val()); }))
+      .append("<br /><br />Passwords must be 8 characters long.");
+    $('#message2').empty().append(p);
+    return;    
+  }
+  if (!pass2)
+  {
+    var p = $('<p/>').addClass('note warning')
+      .append("Please enter it again to confirm:<br /><br />")
+      .append($('<input/>').attr('type', 'password').attr('id', 'pass2').css('width', '200px')).append(' ')
+      .append($('<input/>').attr('type', 'button').val('Continue').click(function(e) { reset_user_password(pass1, $('#pass2').val()); }))
+      .append("<br /><br />Passwords must be 8 characters long.");      
+    $('#message2').empty().append(p);
+    return;    
+  }
+  $('#message2').html("<p class='loading'>Setting password...</p>");
+  $.ajax({
+    url: '/my-account',
+    type: 'put',
+    data: {
+      password: pass1,
+      confirm: pass2
+    },
+    success: function(resp) {
+      if (resp.error) $('#message2').html("<p class='note error'>" + resp.error + "</p>");
+      if (resp.success) {
+        $('#message2').html("<p class='note success'>The password has been successfully updated.</p>");
+        setTimeout(function() { $('#message2').empty(); }, 3000);
+      }
+    }      
+  });  
+}
+
+</script>
+<% end %>
+<%= content_for :caboose_css do %>
+<%= stylesheet_link_tag "caboose/my_account", :media => "all" %>
+<style type='text/css'>
+
+.stripe_form { width: 100%; }
+.stripe_form .card_number_container { position: relative; width: 100%; }                                 .stripe_form .card_number_container input { padding-left: 30px; height: 37px;            font-size: 15px; width: 100%; border-color: #b9b9b9; border-style: solid; border-width: 1px 1px 0px 1px; }
+.stripe_form .card_exp_container    { position: relative; width: 50% !important; float: left; }          .stripe_form .card_exp_container    input { padding-left: 30px; height: 37px;            font-size: 15px; width: 100%; border-color: #b9b9b9; border-style: solid; border-width: 1px 1px 0px 1px; }
+.stripe_form .card_cvc_container    { position: relative; width: 50%; float: left; }                     .stripe_form .card_cvc_container    input { padding-left: 30px; height: 37px;            font-size: 15px; width: 100%; border-color: #b9b9b9; border-style: solid; border-width: 1px 1px 0px 0px; }
+.stripe_form .card_name_container   { position: relative; width: 50%; float: left; }                     .stripe_form .card_name_container   input { padding-left: 10px; height: 37px !important; font-size: 15px; width: 100%; border-color: #b9b9b9; border-style: solid; border-width: 1px 0px 1px 1px; }
+.stripe_form .card_zip_container    { position: relative; width: 50%; float: left; margin-bottom: 4px; } .stripe_form .card_zip_container    input { padding-left: 10px; height: 37px;            font-size: 15px; width: 100%; border-color: #b9b9b9; border-style: solid; border-width: 1px 1px 1px 0px; }
+
+.stripe_form .card_number_container .icon { position: absolute; top: 3px; left: 1px; transform-origin: 50% 50% 0; pointer-events: none; }
+.stripe_form .card_exp_container    .icon { position: absolute; top: 3px; left: 1px; transform-origin: 50% 50% 0; pointer-events: none; }
+.stripe_form .card_cvc_container    .icon { position: absolute; top: 3px; left: 1px; transform-origin: 50% 50% 0; pointer-events: none; }
+
+.stripe_form .note { width: 100%; margin-bottom: 10px !important; text-align: center; }
+.stripe_form .payment_controls { clear: left; margin-top: 4px !important; }
+
+</style>
+<% end %>

data/app/views/caboose/pages/admin_edit_content.html.erb

@@ -1,6 +1,8 @@
 
 <% content_for :caboose_css do %>
 <%= stylesheet_link_tag 'jquery-ui' %>
+<%= stylesheet_link_tag 'caboose/admin_block_edit_image' %>
+<%= stylesheet_link_tag "caboose/modal_inline" %>
 <style type='text/css'>
 #tiny_header {
   display: block;  
@@ -53,12 +55,25 @@
 
 <% content_for :caboose_js do %>
 <%= javascript_include_tag 'jquery-ui' %>
+<%= javascript_include_tag 'caboose/model/all' %>
+<%= javascript_include_tag 'caboose/jquery-ui.drag-multiple.min.js' %>
+<%= javascript_include_tag "caboose/clipboard" %>
 <%= javascript_include_tag 'caboose/admin_page_edit_content' %>
+<%= javascript_include_tag "caboose/class" %>
+<%= javascript_include_tag "caboose/modal_controllers/modal_controller" %>
+<%= javascript_include_tag "caboose/modal_controllers/modal_block_controller" %>
+<%= javascript_include_tag "caboose/modal_controllers/modal_media_controller" %>
+<% @page.block.modal_js_block_names.each do |s| %>
+  <%= javascript_include_tag "caboose/modal_controllers/modal_#{s}_controller" %>
+<% end %>   
 <script type='text/javascript'>
 
 var controller = false;
 $(document).ready(function() {
-  controller = new PageContentController(<%= @page.id %>);
+  controller = new PageContentController({
+    page_id: <%= @page.id %>,
+    assets_path: <%= raw Caboose.json(asset_path('loading.gif').gsub('loading.gif', '')) %>
+  });
 
   $('body').append($('<div/>')        
     .attr('id', 'tiny_header')

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.8.43'
+  VERSION = '0.8.44'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.8.43
+  version: 0.8.44
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-18 00:00:00.000000000 Z
+date: 2016-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -524,6 +524,7 @@ files:
 - app/assets/javascripts/caboose/application.js
 - app/assets/javascripts/caboose/authorize.net.js
 - app/assets/javascripts/caboose/block_media_controller.js
+- app/assets/javascripts/caboose/card.js
 - app/assets/javascripts/caboose/cart.js
 - app/assets/javascripts/caboose/cart_old.js
 - app/assets/javascripts/caboose/checkout.js
@@ -545,6 +546,7 @@ files:
 - app/assets/javascripts/caboose/checkout_payment_stripe.js
 - app/assets/javascripts/caboose/checkout_shipping.js
 - app/assets/javascripts/caboose/class.js
+- app/assets/javascripts/caboose/clipboard.js
 - app/assets/javascripts/caboose/date_format.js
 - app/assets/javascripts/caboose/google_spreadsheets.js
 - app/assets/javascripts/caboose/imageZoom.js
@@ -564,6 +566,7 @@ files:
 - app/assets/javascripts/caboose/modal_controllers/modal_block_controller.js
 - app/assets/javascripts/caboose/modal_controllers/modal_button_controller.js
 - app/assets/javascripts/caboose/modal_controllers/modal_controller.js
+- app/assets/javascripts/caboose/modal_controllers/modal_media_controller.js
 - app/assets/javascripts/caboose/modal_integration.js
 - app/assets/javascripts/caboose/model.form.page.js
 - app/assets/javascripts/caboose/model.form.user.js
@@ -684,6 +687,7 @@ files:
 - app/assets/stylesheets/caboose/admin_crumbtrail.css.scss
 - app/assets/stylesheets/caboose/admin_main.css
 - app/assets/stylesheets/caboose/admin_media_index.css.scss
+- app/assets/stylesheets/caboose/admin_new_block.css
 - app/assets/stylesheets/caboose/admin_page_edit_content.css
 - app/assets/stylesheets/caboose/admin_post_edit_content.css
 - app/assets/stylesheets/caboose/admin_products.css
@@ -707,7 +711,7 @@ files:
 - app/assets/stylesheets/caboose/modal_inline.css
 - app/assets/stylesheets/caboose/modal_main.css
 - app/assets/stylesheets/caboose/model_binder.css
-- app/assets/stylesheets/caboose/my_account.css
+- app/assets/stylesheets/caboose/my_account.scss
 - app/assets/stylesheets/caboose/my_account_edit_invoice.css.scss
 - app/assets/stylesheets/caboose/nestable.css
 - app/assets/stylesheets/caboose/page_bar_generator.css
@@ -1080,6 +1084,7 @@ files:
 - app/views/caboose/modal/index.html.erb
 - app/views/caboose/modification_value_input_fields/admin_edit.html.erb
 - app/views/caboose/my_account/index.html.erb
+- app/views/caboose/my_account/index_old.html.erb
 - app/views/caboose/my_account_invoices/authnet_relay.html.erb
 - app/views/caboose/my_account_invoices/authnet_response.html.erb
 - app/views/caboose/my_account_invoices/edit.html.erb

data/app/assets/stylesheets/caboose/my_account.css

@@ -1,2 +0,0 @@
-
-#my_account p { margin-bottom: 10px; }