caboose-cms 0.5.122 → 0.5.123

data/lib/caboose/engine.rb

@@ -74,161 +74,44 @@ module Caboose
       app.config.assets.precompile += [      
         
         # Images
-        'caboose/caboose_logo_small.png',
-        'caboose/caboose_nav_black.png',
-        'caboose/caboose_nav.png',
-        'caboose/default_user_pic.png',
-        'caboose/loading_black_on_white.gif',
-        'caboose/loading_green.gif',
-        'caboose/loading_small_black_on_white.gif',
-        'caboose/loading_small_white_on_black.gif',
-        'caboose/loading_white_on_black.gif',
-        'caboose/search.png',
+        'caboose/*.png',
+        'caboose/*.gif',        
         
         # Javascript
-        'caboose/admin_block_edit.js',
-        'caboose/admin_edit_order.js',
-        'caboose/admin_images_index.js',
-        'caboose/admin_main.js',
-        'caboose/admin_page_edit_content.js',
-        'caboose/admin_page_new_blocks.js',
-        'caboose/admin_products.js',
-        'caboose/admin.js',
-        'caboose/application.js',
-        'caboose/authorize.net.js',        
-        'caboose/cart.js',
-        'caboose/cart_old.js',
-        'caboose/checkout_addresses.js',
-        'caboose/checkout_gift_cards.js',
-        'caboose/checkout_login_register.js',
-        'caboose/checkout_module.js',
-        'caboose/checkout_payment.js',
-        'caboose/checkout_shipping.js',
-        'caboose/checkout.js',
-        'caboose/date_format.js',
-        'caboose/imageZoom.js',
-        'caboose/jquery.detect.js',
-        'caboose/jquery.fileupload.js',
-        'caboose/jquery.iframe-transport.js',
-        'caboose/jquery.placeholder.js',
-        'caboose/jquery.timepicker.js',
-        'caboose/lodash.min.js',
-        'caboose/main.js',
-        'caboose/modal_integration.js',
-        'caboose/modal.js',        
-        'caboose/model/all.js',
-        'caboose/model/attribute.js',
-        'caboose/model/bound_checkbox_multiple.js',
-        'caboose/model/bound_checkbox.js',
-        'caboose/model/bound_code.js',
-        'caboose/model/bound_color.js',
-        'caboose/model/bound_control.js',
-        'caboose/model/bound_date.js',
-        'caboose/model/bound_file.js',
-        'caboose/model/bound_image.js',
-        'caboose/model/bound_richtext.js',
-        'caboose/model/bound_s3_image.js',
-        'caboose/model/bound_select.js',
-        'caboose/model/bound_text.js',
-        'caboose/model/bound_textarea.js',
-        'caboose/model/bound_time.js',
-        'caboose/model/class.js',
-        'caboose/model/index_table_bak.js',
-        'caboose/model/index_table.js',
-        'caboose/model/model_binder.js',
-        'caboose/model/model.js',
-        'caboose/model/pager.js',
-        'caboose/model/s3.js',
-        'caboose/model.form.page.js',
-        'caboose/model.form.user.js',
-        'caboose/product.js',
-        'caboose/s3upload.js',
-        'caboose/shortcut.js',
-        'caboose/spectrum.js',
-        'caboose/station.js',
-        'caboose/testing.js',
-        'jquery.js',        
+        'caboose/*.js',                
+        'caboose/model/*.js',        
+        'jquery.js',
         'jquery_ujs.js',
         'jquery-ui.js',
-        'colorbox-rails/jquery.colorbox-min.js',        
         'colorbox-rails.js',
-        'colorbox-rails/colorbox-links.js',
-        'tinymce/plugins/caboose/plugin.js',                
-        'tinymce/preinit.js',        
-        'tinymce/plugins/caboose/plugin.js',        
-        'tinymce/themes/modern/theme.js',
-        'tinymce/plugins/advlist/plugin.js',
-        'tinymce/plugins/lists/plugin.js',
-        'tinymce/plugins/autolink/plugin.js',
-        'tinymce/plugins/link/plugin.js',
-        'tinymce/plugins/image/plugin.js',
-        'tinymce/plugins/charmap/plugin.js',
-        'tinymce/plugins/print/plugin.js',
-        'tinymce/plugins/preview/plugin.js',
-        'tinymce/plugins/hr/plugin.js',
-        'tinymce/plugins/anchor/plugin.js',
-        'tinymce/plugins/searchreplace/plugin.js',
-        'tinymce/plugins/pagebreak/plugin.js',
-        'tinymce/plugins/wordcount/plugin.js',
-        'tinymce/plugins/visualblocks/plugin.js',
-        'tinymce/plugins/visualchars/plugin.js',
-        'tinymce/plugins/code/plugin.js',
-        'tinymce/plugins/fullscreen/plugin.js',
-        'tinymce/plugins/insertdatetime/plugin.js',
-        'tinymce/plugins/media/plugin.js',
-        'tinymce/plugins/nonbreaking/plugin.js',
-        'tinymce/plugins/table/plugin.js',
-        'tinymce/plugins/contextmenu/plugin.js',
-        'tinymce/plugins/directionality/plugin.js',
-        'tinymce/plugins/emoticons/plugin.js',
-        'tinymce/plugins/paste/plugin.js',
-        'tinymce/plugins/template/plugin.js',
-        'tinymce/plugins/textcolor/plugin.js',
+        'colorbox-rails/jquery.colorbox-min.js',
+        'colorbox-rails/colorbox-links.js',        
+        'tinymce/preinit.js',
         'tinymce/plugins/caboose/plugin.js',
-        
-        # Site JS
-        '*/js/application.js',
+        'tinymce/themes/modern/theme.js',
+        'tinymce/plugins/*/plugin.js',
+        '*/js/application.js', # Site JS
 
         # CSS   
+        'caboose/*.css',
         'caboose/admin_crumbtrail.css',
-        'caboose/admin_images_index.css',
-        'caboose/admin_main.css',
-        'caboose/admin_page_edit_content.css',
-        'caboose/admin_products.css',
-        'caboose/admin.css',
-        'caboose/application.css',
-        'caboose/bound_input.css',
-        'caboose/caboose.css',
+        'caboose/admin_images_index.css',                        
         'caboose/cart.css',
         'caboose/checkout.css',        
-        'caboose/fonts/avenir-medium.eot',
-        'caboose/fonts/avenir-medium.ttf',
-        'caboose/fonts/big_noodle_titling_oblique.ttf',
-        'caboose/fonts/big_noodle_titling.ttf',
-        'caboose/fonts.css',
-        'caboose/icomoon_fonts.css',
-        'caboose/icons.txt',
-        'caboose/jquery.timepicker.css',
-        'caboose/login.css',
         'caboose/message_boxes.css',
-        'caboose/modal.css',
-        'caboose/model_binder.css',
-        'caboose/page_bar_generator.css',
-        'caboose/print.css',
         'caboose/product_images.css',
-        'caboose/product_options.css',
-        'caboose/register.css',
-        'caboose/responsive.css',
-        'caboose/spectrum.css',
-        'caboose/station_modal.css',
-        'caboose/station_sidebar.css',
-        'caboose/tinymce.css',
+        'caboose/product_options.css',                        
         'colorbox-rails.css',        
         'colorbox-rails/colorbox-rails.css',
-        'jquery-ui.css',
-        
-        # Site CSS
-        '*/css/application.css'
+        'jquery-ui.css',                
+        '*/css/application.css' # Site CSS
+
+        # Fonts
+        'caboose/fonts/avenir-medium.eot',
+        'caboose/fonts/avenir-medium.ttf',
+        'caboose/fonts/big_noodle_titling_oblique.ttf',
+        'caboose/fonts/big_noodle_titling.ttf',               
+        'caboose/icons.txt',
         
       ]      
     end

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.122'
+  VERSION = '0.5.123'
 end

data/lib/tasks/caboose.rake

@@ -66,6 +66,20 @@ namespace :caboose do
       ActiveRecord::Base.connection.execute(ActiveRecord::Base.send(:sanitize_sql_array, query))
     end
   end
+  
+  desc "Set order numbers"
+  task :set_order_numbers => :environment do
+    
+    Caboose::Site.all.each do |site|
+      next if !site.use_store
+      i = site.store_config.starting_order_number
+      Caboose::Order.where("order_number is null and status <> 'cart'").reorder(:id).all.each do |o|
+        o.order_number = i
+        o.save
+        i = i + 1
+      end
+    end
+  end
 
   #=============================================================================
   
@@ -173,5 +187,5 @@ namespace :assets do
       end
     end
   end
-  
+    
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.122
+  version: 0.5.123
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -401,6 +401,7 @@ files:
 - app/assets/javascripts/caboose/checkout_shipping.js
 - app/assets/javascripts/caboose/date_format.js
 - app/assets/javascripts/caboose/imageZoom.js
+- app/assets/javascripts/caboose/jquery.datetimepicker.js
 - app/assets/javascripts/caboose/jquery.detect.js
 - app/assets/javascripts/caboose/jquery.fileupload.js
 - app/assets/javascripts/caboose/jquery.iframe-transport.js
@@ -420,6 +421,7 @@ files:
 - app/assets/javascripts/caboose/model/bound_color.js
 - app/assets/javascripts/caboose/model/bound_control.js
 - app/assets/javascripts/caboose/model/bound_date.js
+- app/assets/javascripts/caboose/model/bound_date_time.js
 - app/assets/javascripts/caboose/model/bound_file.js
 - app/assets/javascripts/caboose/model/bound_image.js
 - app/assets/javascripts/caboose/model/bound_richtext.js
@@ -460,6 +462,7 @@ files:
 - app/assets/stylesheets/caboose/fonts/big_noodle_titling_oblique.ttf
 - app/assets/stylesheets/caboose/icomoon_fonts.css
 - app/assets/stylesheets/caboose/icons.txt
+- app/assets/stylesheets/caboose/jquery.datetimepicker.css
 - app/assets/stylesheets/caboose/jquery.timepicker.css
 - app/assets/stylesheets/caboose/login.css
 - app/assets/stylesheets/caboose/message_boxes.css.scss
@@ -512,6 +515,7 @@ files:
 - app/controllers/caboose/logout_controller.rb
 - app/controllers/caboose/media_categories_controller.rb
 - app/controllers/caboose/modal_controller.rb
+- app/controllers/caboose/my_account_controller.rb
 - app/controllers/caboose/my_account_line_items_controller.rb
 - app/controllers/caboose/my_account_orders_controller.rb
 - app/controllers/caboose/order_packages_controller.rb
@@ -584,6 +588,7 @@ files:
 - app/models/caboose/media_image.rb
 - app/models/caboose/menu_block.rb
 - app/models/caboose/message.rb
+- app/models/caboose/model_binder.rb
 - app/models/caboose/order.rb
 - app/models/caboose/order_discount.rb
 - app/models/caboose/order_package.rb
@@ -748,12 +753,14 @@ files:
 - app/views/caboose/login/reset_password_form.html.erb
 - app/views/caboose/login_mailer/forgot_password_email.html.erb
 - app/views/caboose/modal/index.html.erb
+- app/views/caboose/my_account/index.html.erb
+- app/views/caboose/my_account_orders/edit.html.erb
+- app/views/caboose/my_account_orders/index.html.erb
 - app/views/caboose/orders/_admin_footer.html.erb
 - app/views/caboose/orders/_admin_header.html.erb
 - app/views/caboose/orders/_quickbooks_order.html.erb
 - app/views/caboose/orders/admin_delete_form.html.erb
 - app/views/caboose/orders/admin_edit.html.erb
-- app/views/caboose/orders/admin_edit_old.html.erb
 - app/views/caboose/orders/admin_index.html.erb
 - app/views/caboose/orders/admin_new.html.erb
 - app/views/caboose/orders/admin_print.html.erb
@@ -843,7 +850,6 @@ files:
 - app/views/caboose/users/edit_password.html.erb
 - app/views/caboose/users/import_form.html.erb
 - app/views/caboose/users/index.html.erb
-- app/views/caboose/users/my_account.html.erb
 - app/views/caboose/users/new.html.erb
 - app/views/caboose/users/update_pic.html.erb
 - app/views/caboose/variants/admin_edit.html.erb
@@ -888,6 +894,7 @@ files:
 - config/tinymce.yml
 - db/migrate/000_add_linked_resources_to_page.rb
 - lib/caboose.rb
+- lib/caboose/#Untitled-1#
 - lib/caboose/caboose_helper.rb
 - lib/caboose/engine.rb
 - lib/caboose/version.rb

data/app/views/caboose/orders/admin_edit_old.html.erb

@@ -1,155 +0,0 @@
-<%
-sa = @order.shipping_address
-shipping_address = sa.address1
-shipping_address << "<br />#{sa.address2}" if sa.address2 && sa.address2.length > 0
-shipping_address << "<br />#{sa.city}, #{sa.state} #{sa.zip}"
-captured = @order.financial_status == 'captured'
-%>
-<input type='hidden' name='order_id'    id='order_id'     value='<%= @order.id %>' />
-
-<h1>Edit Order #<%= @order.id %></h1>
-         
-<table class='data'>
-<tr>
-  <th><%= if @order.customer.nil? then 'Guest' else 'Customer' end %></th>
-  <th>Shipping Address</th>
-  <th>Shipping Method</th>
-  <th>Order Status</th>
-  <th>Payment Status</th>
-  <th>Transaction ID</th>
-</tr>
-<tr>
-  <td valign='top'>
-    <%= "#{@order.shipping_address.first_name} #{@order.shipping_address.last_name}" %><br />
-    <% if @order.customer %>
-      <a href="mailto:<%= "#{@order.customer.email}" %>"><%= "#{@order.customer.email}" %></a><br />
-    <% elsif @order.email %>
-      <a href="mailto:<%= @order.email %>"><%= @order.email %></a>
-    <% end %>
-    <%= @order.customer ? @order.customer.phone : @order.shipping_address.phone %>    
-  </td>
-  <td valign='top'>
-    <%= "#{@order.shipping_address.first_name} #{@order.shipping_address.last_name}" %><br />
-    <%= raw shipping_address %>
-  </td>
-  <td valign='top' align='center'>
-    <% if @order.shipping_service_code %>
-      <%= @order.shipping_carrier %> <%= @order.shipping_service_name %>
-    <% else %>
-      Multiple packages
-    <% end %>
-  </td>
-  <td valign='top'>
-    <div id='order_<%= @order.id %>_status'></div>
-  </td>
-  <td valign='top' align='center'>
-    <%= @order.financial_status %>
-    <% if @order.financial_status == 'authorized' %>
-    for<br /><%= number_to_currency(@order.auth_amount) %>
-    <% end %>
-  </td>
-  <td valign="top" align='center'><%= @order.transaction_id %></td>
-</tr>
-</table><br />
-
-<table class='data' width='100%'>
-<tr>
-  <th>Package</th>
-  <th>Item</th>
-  <th>Status</th>    
-  <th>Unit Price</th>
-  <th>Quantity</th>
-  <th>Subtotal</th>
-</tr>
-<% @order.packages.each do |op| %>  
-  <% op.line_items.each_with_index do |li, i| %>
-    <tr>
-      <% if i == 0 %>
-        <td rowspan="<%= op.line_items.count %>">
-          <div id='orderpackage_<%= op.id %>_shipping_method_id'></div>
-          <div id='orderpackage_<%= op.id %>_status'></div>    
-        </td>
-      <% end %>  
-      <td>
-        <% if li.variant.nil? || li.variant.product.nil? %>
-          <% if li.variant.nil? %>
-            Unknown variant
-          <% else %>
-            <%= li.variant.sku %>
-          <% end %>
-        <% else %>
-          <a href='/admin/products/<%= li.variant.product.id %>/variants?highlight=<%= li.variant.id %>'><%= li.variant.product.title  %></a><br />
-          <%= li.variant.sku            %><br />
-          <%= li.variant.title          %>
-        <% end %>
-      </td>
-      <td              ><div id='lineitem_<%= li.id %>_status'          ></div></td>      
-      <td align='right'><%= number_to_currency(li.variant.price) %></td>    
-      <td align='right'><% if captured %><%= li.quantity %><% else %><div id='lineitem_<%= li.id %>_quantity'></div><% end %></td>
-      <td align='right' id='li_<%= li.id %>_subtotal'><%= number_to_currency(li.price) %></td>
-    </tr>
-  <% end %>
-<% end %>
-<% @order.line_items.each do |li| %>   
-  <% next if li.order_package_id %>  
-  <tr>    
-    <td><div id='assign_to_package'>Unpackaged! <a href='#' onclick="assign_to_package_form(<%= li.id %>);">Assign to package</a></div></td>    
-    <td>
-      <% if li.variant.nil? || li.variant.product.nil? %>
-        <% if li.variant.nil? %>Unknown variant<% else %><%= li.variant.sku %><% end %>
-      <% else %>
-        <a href='/admin/products/<%= li.variant.product.id %>/variants?highlight=<%= li.variant.id %>'><%= li.variant.product.title  %></a><br />
-        <%= li.variant.sku            %><br />
-        <%= li.variant.title          %>
-      <% end %>
-    </td>
-    <td              ><div id='lineitem_<%= li.id %>_status'          ></div></td>    
-    <td align='right'><%= number_to_currency(li.variant.price) %></td>    
-    <td align='right'><% if captured %><%= li.quantity %><% else %><div id='lineitem_<%= li.id %>_quantity'></div><% end %></td>
-    <td align='right' id='li_<%= li.id %>_subtotal'><%= number_to_currency(li.price) %></td>
-  </tr>
-<% end %>
-<tr><td colspan='5' align='right'>Subtotal                </td><td align='right' id='subtotal'   ><%= number_to_currency(@order.subtotal ) %></td></tr>
-<tr><td colspan='5' align='right'>Tax                     </td><td align='right' id='tax'        ><%= number_to_currency(@order.tax      ) %></td></tr>
-<tr><td colspan='5' align='right'><%= @order.shipping_service_code ? @order.shipping_service_code : '' %> Shipping &amp; Handling </td><td align='right' id='shipping'><%= number_to_currency(@order.shipping + @order.handling) %></td></tr>
-<tr>
-  <td colspan='5' align='right'>Discount</td>
-  <td align='right'>
-    <% if captured && @order.discounts.any? %>
-      <%= number_to_currency(@order.amount_discounted || 0) %>
-    <% elsif @order.discounts.any? %>
-      <%= number_to_currency(@order.discounts.first.amount_current) %>
-    <% else %>
-      $0.00
-    <% end %>
-  </td>
-</tr>
-<tr><td colspan='5' align='right'>Total                   </td><td align='right' id='total'      ><%= number_to_currency(@order.total    ) %></td></tr>
-</table>
-<div id='message'></div>
-
-<p>
-<input type='button' value='< Back' onclick="window.location='/admin/orders';" />
-<% if @order.financial_status == 'authorized' %>
-  <input type='button' value='Capture Funds' onclick="capture_funds(<%= @order.id %>);" />
-  <input type='button' value='Void' onclick="void_order(<%= @order.id %>);" />
-<% end %>
-<% if @order.financial_status == 'captured' %>
-  <input type='button' value='Refund' onclick="refund_order(<%= @order.id %>);" />
-<% end %>
-<input type='button' value='Resend Confirmation' onclick="resend_confirmation(<%= @order.id %>)" />
-<input type='button' value='Print Order' onclick="print_order(<%= @order.id %>);" />
-
-<% str = Caboose.plugin_hook('admin_edit_order_buttons', "", @order) %>
-<% if str %><%= raw str %><% end %>
-</p>
-
-<% content_for :caboose_js do %>
-<%= javascript_include_tag 'caboose/model/all' %>
-<%= javascript_include_tag 'caboose/admin_edit_order' %>
-<script type='text/javascript'>
-
-var controller = new OrderController({ order_id: <%= raw Caboose.json(@order.id) %> });
-
-</script>
-<% end %>