RubyGems - spree_core - Versions diffs - 0.30.0.beta1 → 0.30.0 - Mend

spree_core 0.30.0.beta1 → 0.30.0

Files changed (513) hide show

data/app/views/orders/_line_item.html.erb CHANGED Viewed

@@ -2,8 +2,6 @@
   <td>
     <%- locals = {:item_form => item_form, :variant => variant, :line_item => line_item} %>
     <%= hook :cart_item_image, locals do %>
-      <%= item_form.hidden_field :variant_id %>
-      <%= item_form.hidden_field :order_id %>
       <% if variant.images.length == 0 %>
         <%= small_image(variant.product) %>
       <% else %>
@@ -25,7 +23,7 @@
   </td>
   <td>
     <%= hook :cart_item_quantity, locals do %>
-      <%= item_form.text_field :quantity, :size => 3 %>
+      <%= item_form.text_field :quantity, :size => 3, :class => "line_item_quantity" %>
     <% end %>
   </td>

data/app/views/orders/edit.html.erb CHANGED Viewed

@@ -2,7 +2,7 @@
 <h1><%= t("shopping_cart")%></h1>
-<% if @order.nil? or @order.line_items.empty? %>
+<% if @order.line_items.empty? %>
   <%= hook :empty_cart do %>
     <p><%= t("your_cart_is_empty.") %></p>

data/app/views/shared/_basic_layout.html.erb ADDED Viewed

@@ -0,0 +1,44 @@
+<%
+if @body_class.nil?
+  if content_for?(:sidebar)
+    @body_class = 'two-col'
+  else
+    @body_class = 'one-col'
+  end
+end
+ %>
+<body class="<%= @body_class %>" id="<%= @body_id %>">
+  <div id="header" class="container_bg">
+    <div class="container">
+    <div id="login-bar">
+      <ul id="nav-bar">
+        <%= render 'shared/nav_bar' %>
+      </ul>
+    </div>
+  <%= logo %>
+  </div>
+  </div>
+  <div id="wrapper" class="container">
+    <% if content_for?(:sidebar) %>
+    <div id="sidebar">
+      <%= hook :sidebar do %>
+        <%= yield :sidebar %>
+      <% end %>
+    </div>
+    <% end %>
+    <div id="content">
+      <%= breadcrumbs(@taxon) if @taxon %>
+      <% if flash.notice %>
+      <div class="flash notice"><%= flash.notice %></div>
+      <% end %>
+      <% if flash[:error] %>
+      <div class="flash errors"><%= flash[:error] %></div>
+      <% end %>
+      <%= yield %>
+    </div>
+    <%= render :partial => 'shared/footer'%>
+  </div>
+</body>

data/app/views/shared/_google_analytics.html.erb CHANGED Viewed

@@ -8,32 +8,33 @@
   <script type="text/javascript">
     var pageTracker = _gat._getTracker("<%= tracker.analytics_id %>");
     pageTracker._initData();
-    /* Standard analytics or "virtual page" (useful for goal tracking and funnel stuff) plus optional E-Commerce conversion */
-    <% if flash[:analytics] %>
-      pageTracker._trackPageview("<%=flash[:analytics]%>");
-    <% else %>
-      pageTracker._trackPageview();
-    <% end %>
-    <% if flash[:commerce_tracking] %>
+    pageTracker._trackPageview();
+  </script>
+  <% if flash[:commerce_tracking] %>
+    <script type="text/javascript">
       // report e-commerce transaction information when applicable
       pageTracker._addTrans(
-      "<%= @order.number %>",		//Order Number
-      "",		//Affiliation
-      "<%= @order.total %>",		//Order total
-      "<%= @order.tax_charges.sum(:amount).to_s %>",		//Tax Amount
-      "<%= @order.shipping_charges.sum(:amount).to_s %>",		//Ship Amount
-      "",		//City
-      "",		//State
-      ""		//Country
+      "<%= @order.number %>",    //Order Number
+      "",    //Affiliation
+      "<%= @order.total %>",    //Order total
+      "<%= @order.adjustments.tax.sum(:amount).to_s %>",    //Tax Amount
+      "<%= @order.adjustments.shipping.sum(:amount).to_s %>",    //Ship Amount
+      "",    //City
+      "",    //State
+      ""    //Country
       );
       <% @order.line_items.each do |line_item| %>
-      pageTracker._addItem("<%= @order.number %>", "<%= line_item.variant.sku %>", "<%= line_item.variant.product.name %>",
-        "" /*Product Category*/, "<%= line_item.price %>", "<%= line_item.quantity %>");
+        pageTracker._addItem("<%= @order.number %>", "<%= line_item.variant.sku %>", "<%= line_item.variant.product.name %>",
+          "" /*Product Category*/, "<%= line_item.price %>", "<%= line_item.quantity %>");
       <% end %>
       pageTracker._trackTrans();
+    </script>
+  <% end %>
+<% end %>
-    <% end %>
-  </script>
-<% end %>

data/app/views/shared/_head.html.erb CHANGED Viewed

@@ -2,7 +2,7 @@
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <%= raw stylesheet_tags %>
 <%= csrf_meta_tag %>
-<%= javascript_include_tag 'jquery-1.3.2.min', 'jquery.validate.min.js', 'rails', 'application', :cache => 'jquery-core' %>
+<%= javascript_include_tag 'jquery-1.4.2.min', 'jquery.validate.min.js', 'rails', 'application', :cache => 'jquery-core' %>
 <% unless I18n.locale.to_s[0..1] == 'en' %>
   <%= javascript_include_tag ['localization/messages_', I18n.locale.to_s[0..1], '.js'].join %>
 <% end %>

data/app/views/shared/_products.html.erb CHANGED Viewed

@@ -1,5 +1,5 @@
 <%
-  paginated_products = Spree::Config.searcher.products if params.key?(:keywords)
+  paginated_products = @searcher.products if params.key?(:keywords)
   paginated_products ||= products
 %>
 <% if products.empty? %>

data/app/views/shipment_mailer/shipped_email.text.erb ADDED Viewed

@@ -0,0 +1,15 @@
+Dear Customer,
+Your order has been shipped
+============================================================
+Shipment Summary
+============================================================
+<% for item in @shipment.line_items %>
+<%=item.variant.sku %> <%=item.variant.product.name%> <%= variant_options(item.variant) %> (<%=item.quantity%>) %>
+<% end %>
+============================================================
+<%= "Tracking Information: #{@shipment.tracking}" if @shipment.tracking %>
+Thank you for your business.

data/app/views/taxons/_taxon.html.erb CHANGED Viewed

@@ -1,4 +1,4 @@
 <div class="taxon">
   <h2><%= link_to taxon.name, seo_url(taxon), :class => 'breadcrumbs' %></h2>
-  <%= render :partial => "shared/products.html.erb", :locals => {:products => taxon_preview(taxon), :taxon => taxon} %>
-</div>
+  <%= render :partial => "shared/products", :locals => {:products => taxon_preview(taxon), :taxon => taxon} %>
+</div>

data/config/initializers/spree.rb CHANGED Viewed

@@ -1,3 +1,5 @@
+require 'mail'
 # Spree Configuration
 SESSION_KEY = '_spree_session_id'
 #require 'spree/support/core_ext/array/conversions'
@@ -10,8 +12,10 @@ ActiveRecord::Base.class_eval do
   include Spree::Preferences::ModelHooks
 end
-# Initialize mail server settings
-Spree::Preferences::MailSettings.init
+if MailMethod.table_exists?
+  Spree::MailSettings.init
+  Mail.register_interceptor(Spree::MailInterceptor)
+end
 # Add extra support goodies (similar to rails active support)
 #class Array #:nodoc:

data/config/locales/{en_spree.yml → en.yml} RENAMED Viewed

@@ -9,7 +9,6 @@ en:
   account: Account
   account_updated: "Account updated!"
   action: Action
-  alt_text: Alternative Text
   actions:
     cancel: Cancel
     create: Create
@@ -224,6 +223,7 @@ en:
   address: Address
   address_information: "Address Information"
   adjustment: Adjustment
+  adjustment_total: Adjustment Total
   adjustments: Adjustments
   administration: Administration
   all: "All"
@@ -233,6 +233,7 @@ en:
   allow_ssl_to_be_used_when_in_production_mode: Allow SSL to be used in production mode
   allowed_ssl_in_production_mode: "SSL will %{not} be used in production"
   already_registered: Already Registered?
+  alt_text: Alternative Text
   alternative_phone: Alternative Phone
   amount: Amount
   analytics_trackers: Analytics Trackers
@@ -258,10 +259,10 @@ en:
   balance_due: "Balance Due"
   best_selling_products: "Best Selling Products"
   best_selling_taxons: "Best Selling Taxons"
-  both: Both
   bill_address: "Bill Address"
   billing: Billing
   billing_address: "Billing Address"
+  both: Both
   by_day: "by day"
   calculator: Calculator
   calculator_settings_warning: "If you are changing the calculator type, you must save first before you can edit the calculator settings"
@@ -269,8 +270,9 @@ en:
   cancel_my_account: Cancel my account
   cancel_my_account_description: "Unhappy?"
   canceled: Canceled
-  cannot_create_returns: Cannot create returns as this order has not shipped yet.
+  cannot_create_returns: Cannot create returns as this order no shipped units.
   cannot_destory_line_item_as_inventory_units_have_shipped: Cannot destory line item as some inventory units have shipped.
+  cannot_perform_operation: "Cannot perform requested operation"
   capture: Capture
   card_code: "Card Code"
   card_details: "Card details"
@@ -286,13 +288,6 @@ en:
   charged: Charged
   charges: Charges
   checkout: Checkout
-  checkout_steps:
-    # keys correspond to Checkout state names:
-    address: Address
-    complete: Complete
-    confirm: Confirm
-    delivery: Delivery
-    payment: Payment
   cheque: Cheque
   city: City
   clone: Clone
@@ -343,10 +338,12 @@ en:
   destroy: Destroy
   didnt_receive_confirmation_instructions: "Didn't receive confirmation instructions?"
   didnt_receive_unlock_instructions: "Didn't receive unlock instructions?"
+  discount_amount: "Discount Amount"
   display: Display
   edit: Edit
   editing_billing_integration: Editing Billing Integration
   editing_category: "Editing Category"
+  editing_mail_method: Editing Mail Method
   editing_option_type: "Editing Option Type"
   editing_option_types: "Editing Option Types"
   editing_payment_method: Editing Payment Method
@@ -381,7 +378,6 @@ en:
   expiration_year: "Expiration Year"
   extension: Extension
   extensions: Extensions
-  front_end: Front End
   filename: Filename
   final_confirmation: "Final Confirmation"
   finalize: Finalize
@@ -395,6 +391,7 @@ en:
   flat_rate_per_order: "Flat Rate (per order)"
   flexible_rate: "Flexible Rate"
   forgot_password: "Forgot Password?"
+  front_end: Front End
   full_name: "Full Name"
   gateway: Gateway
   gateway_configuration: "Gateway configuration"
@@ -428,6 +425,8 @@ en:
   included_in_this_shipment: Included in this Shipment
   instructions_to_reset_password: "Fill out the form below and instructions to reset your password will be emailed to you:"
   integration_settings_warning: "If you are changing the billing integration, you must save first before you can edit the integration settings"
+  intercept_email_address: Intercept Email Address
+  intercept_email_instructions: "Override email recipient and replace with this address."
   invalid_search: "Invalid search criteria."
   inventory: Inventory
   inventory_adjustment: "Inventory Adjustment"
@@ -462,6 +461,7 @@ en:
   logged_in_as: "Logged in as"
   logged_in_succesfully: "Logged in successfully"
   logged_out: "You have been logged out."
+  login: Login
   login_as_existing: "Log In as Existing Customer"
   login_failed: "Login authentication failed."
   login_name: Login
@@ -470,8 +470,8 @@ en:
   maestro_or_solo_cards: Maestro/Solo cards
   mail_delivery_enabled: "Mail delivery is enabled"
   mail_delivery_not_enabled: "Mail delivery is not enabled"
+  mail_methods: Mail Methods
   mail_server_preferences: Mail Server Preferences
-  mail_server_settings: "Mail Server Settings"
   make_refund: Make refund
   mark_shipped: "Mark Shipped"
   master_price: "Master Price"
@@ -480,6 +480,7 @@ en:
   meta_keywords: "Meta Keywords"
   metadata: "Metadata"
   missing_required_information: "Missing Required Information"
+  minimal_amount: "Minimal Amount"
   month: "Month"
   my_account: "My Account"
   my_orders: "My Orders"
@@ -491,6 +492,7 @@ en:
   new_category: "New category"
   new_customer: "New Customer"
   new_image: "New Image"
+  new_mail_method: New Mail Method
   new_option_type: "New Option Type"
   new_option_value: "New Option Value"
   new_order: "New Order"
@@ -524,6 +526,7 @@ en:
   no_user_found: "No user was found with that email address"
   none: None
   none_available: "None Available"
+  normal_amount: "Normal Amount"
   not: not
   not_shown: "Not Shown"
   note: Note
@@ -533,7 +536,6 @@ en:
     product_deleted: "Product has been deleted"
     product_not_cloned: "Product could not be cloned"
     product_not_deleted: "Product could not be deleted"
-    track_me_in_GA: "Track Me in GA"
     variant_deleted: "Variant has been deleted"
     variant_not_deleted: "Variant could not be deleted"
   on_hand: "On Hand"
@@ -555,6 +557,19 @@ en:
   order_operation_authorize: Authorize
   order_processed_but_following_items_are_out_of_stock: "Your order has been processed, but following items are out of stock:"
   order_processed_successfully: "Your order has been processed successfully"
+  order_state:
+    # keys correspond to Checkout state names:
+    address: address
+    adjustments: adjustments
+    awaiting_return: awaiting return
+    canceled: canceled
+    cart: cart
+    complete: complete
+    confirm: confirm
+    delivery: delivery
+    payment: payment
+    resumed : resumed
+    returned: returned
   order_summary: Order Summary
   order_sure_want_to: "Are you sure you want to %{event} this order?"
   order_total: "Order Total"
@@ -584,6 +599,13 @@ en:
   payment_method: Payment Method
   payment_methods: Payment Methods
   payment_methods_setting_description: Configure methods customers can use to pay
+  payment_processing_failed: "Payment could not be processed, please check the details you entered"
+  payment_state: Payment State
+  payment_states:
+    balance_due: balance due
+    credit_owed: credit owed
+    failed: failed
+    paid: paid
   payment_updated: Payment Updated
   payments: Payments
   pending_payments: Pending Payments
@@ -596,6 +618,7 @@ en:
   preview: Preview
   previous: Previous
   price: Price
+  price_bucket: Price Bucket
   price_with_vat_included: "%{price} (inc. VAT)"
   problem_authorizing_card: "Problem authorizing credit card"
   problem_capturing_card: "Problem capturing credit card"
@@ -735,6 +758,7 @@ en:
   provider_settings_warning: "If you are changing the provider type, you must save first before you can edit the provider settings"
   qty: Qty
   quantity_shipped: Quantity Shipped
+  quantity_returned: Quantity Returned
   range: "Range"
   rate: Rate
   reason: Reason
@@ -767,9 +791,9 @@ en:
   return_authorizations: Return Authorizations
   return_quantity: Return Quantity
   returned: Returned
+  rma_credit: RMA Credit
   rma_number: RMA Number
   rma_value: RMA Value
-  rma_credit: RMA Credit
   roles: Roles
   sales_tax: "Sales Tax"
   sales_total: "Sales Total"
@@ -801,6 +825,13 @@ en:
   shipment: Shipment
   shipment_details: Shipment Details
   shipment_number: "Shipment #"
+  shipment_state: Shipment State
+  shipment_states:
+    backorder: backorder
+    partial: partial
+    pending: pending
+    ready: ready
+    shipped: shipped
   shipment_updated: Shipment Updated
   shipments: "Shipments"
   shipped: Shipped
@@ -837,9 +868,7 @@ en:
   smtp_password: SMTP Password
   smtp_port: SMTP Port
   smtp_send_all_emails_as_from_following_address: "Send all mails as from the following address."
-  smtp_send_copy_of_orders_to_this_addresses: "Sends a copy of all order's mails to this address. For multiple addresses, separate with commas."
   smtp_send_copy_to_this_addresses: "Sends a copy of all outgoing mails to this address. For multiple addresses, separate with commas."
-  smtp_send_order_mails_as_from_following_address: "Send orders mails as from the following address."
   smtp_username: SMTP Username
   sold: Sold
   sort_ordering: "Sort ordering"
@@ -922,11 +951,12 @@ en:
   user_created_successfully: "User created successfully"
   user_details: "User Details"
   users: Users
+  validate_on_profile_create: Validate on profile create
   validation:
+    cannot_be_less_than_shipped_units: "cannot be less than the number of shipped units."
     is_too_large: "is too large -- stock on hand cannot cover requested quantity!"
     must_be_int: "must be an integer"
     must_be_non_negative: "must be a non-negative value"
-    cannot_be_less_than_shipped_units: "cannot be less than the number of shipped units."
   value: Value
   variants: Variants
   vat: "VAT"

data/config/routes.rb CHANGED Viewed

@@ -14,10 +14,15 @@ Rails.application.routes.draw do
   resources :states, :only => :index
+  # non-restful checkout stuff
   match '/checkout/update/:state' => 'checkout#update', :as => :update_checkout
   match '/checkout/:state' => 'checkout#edit', :as => :checkout_state
   match '/checkout' => 'checkout#edit', :state => 'address', :as => :checkout
+  # non-restful admin checkout stuff
+  match '/admin/orders/:order_number/checkout' => 'admin/checkout#update', :method => :post, :as => :admin_orders_checkout
+  match '/admin/orders/:order_number/checkout/(:state)' => 'admin/checkout#edit', :method => :get, :as => :admin_orders_checkout
   resources :orders do
     post :populate, :on => :collection
@@ -61,7 +66,7 @@ Rails.application.routes.draw do
   namespace :admin do
     resources :zones
-    #resources :users
+    resources :users
     resources :countries do
       resources :states
     end
@@ -87,8 +92,8 @@ Rails.application.routes.draw do
       end
       resources :taxons do
         member do
-          post :select
-          post :remove
+          get :select
+          delete :remove
         end
         collection do
           post :available
@@ -113,20 +118,20 @@ Rails.application.routes.draw do
       end
     end
-    resource :mail_settings
     resource :inventory_settings
     resources :google_analytics
     resources :orders do
       member do
         put :fire
+        get :fire
         post :resend
         get :history
+        get :user
       end
       resources :adjustments
       resources :line_items
-      resource :checkout
       resources :shipments do
         member do
           put :fire
@@ -140,7 +145,6 @@ Rails.application.routes.draw do
       resources :payments do
         member do
           put :fire
-          put :finalize
         end
       end
     end
@@ -174,13 +178,16 @@ Rails.application.routes.draw do
     resources :trackers
     resources :payment_methods
+    resources :mail_methods
   end
+  match '/content/cvv' => 'content#cvv'
   #RAILS3 TODO - we should disable this by default
   #match '/:controller(/:action(/:id(.:format)))'
   # a catchall route for "static" content (except paths with explicit extensions: .html, .ico, etc)
-  if Spree::Config.instance && Spree::Config.get(:use_content_controller)
+  #if Spree::Config.instance && Spree::Config.get(:use_content_controller)
     match '/*path' => 'content#show', :constraints => { :fullpath => /^\/([^.]+)$/ }
-  end
+  #end
 end