synergy 0.50.0.rc2 → 0.50.0

data/app/controllers/admin/products_controller_decorator.rb

@@ -2,7 +2,10 @@
 Admin::ProductsController.class_eval do
   require 'nokogiri'
   require 'open-uri'
-  
+
+  update.before :nullify_description_if_blank
+  create.before :nullify_description_if_blank
+
   def import_from_yandex_market
     if params[:model_id].to_i > 0
       market_url = "http://market.yandex.ru/model.xml?modelid=#{params[:model_id]}"
@@ -52,9 +55,16 @@ Admin::ProductsController.class_eval do
     end
     redirect_to admin_products_path
   end
-  
+
+  def nullify_description_if_blank
+    description = params[object_name][:description]
+    if description && ActionController::Base.helpers.strip_tags(description).gsub(' ', '').strip.empty?
+      params[object_name][:description] = nil
+    end
+  end
+
   private
-  
+
   def download_remote_image(image_url)
     io = open(URI.parse(image_url))
     def io.original_filename; [base_uri.path.split('/').last, '.jpg'].join; end

data/app/controllers/spree/base_controller_decorator.rb

@@ -0,0 +1,6 @@
+Spree::BaseController.class_eval do       
+  def render_404(exception = nil)
+    @title = I18n.t(:page_not_found)
+    render :template => 'errors/404', :status => "404 Not Found"
+  end
+end

data/app/controllers/user_sessions_controller_decorator.rb

@@ -0,0 +1,23 @@
+UserSessionsController.class_eval do
+  private
+  def associate_user
+    return unless current_user
+    guest_order = current_order
+    order = current_user.orders.where(:completed_at => nil).last
+    if order
+      if guest_order
+        guest_order.line_items.each do |line_item|
+          order.add_variant(line_item.variant, line_item.quantity)
+        end
+        order.save
+        session[:return_to].gsub!(guest_order.number, order.number) if session[:return_to]
+        guest_order.destroy
+      end
+      session[:order_id] = order.id
+    else
+      guest_order.associate_user!(current_user) if guest_order
+    end
+    
+    session[:guest_token] = nil
+  end
+end

data/app/views/admin/overview/index.html.erb

@@ -47,22 +47,22 @@
           <table id="order_totals">
             <tr>
 					    <td style="width:23%;">
-						    <label id="orders_total"><%= number_with_delimiter @orders_total.to_i %>&nbsp;<%= t("number.currency.format.unit") %></label>
+						    <label id="orders_total"><%= number_to_currency(@orders_total.round) %></label>
 						    <span><%= t('orders') %> (<%= t('amount') %>)</span>
 					    </td>
 					    <td class="spacer">|</td>
 					    <td style="width:23%;">
-						    <label id="orders_line_total"><%= number_with_delimiter @orders_line_total.to_i %>&nbsp;<%= t("number.currency.format.unit") %></label>
+						    <label id="orders_line_total"><%= number_to_currency(@orders_line_total.round) %></label>
 						    <span><%== t('items') %> (<%= t('amount') %>)</span>
 					    </td>
 					    <td class="spacer">|</td>
 					    <td style="width:23%;">
-						    <label id="orders_adjustment_total"><%= number_with_delimiter @orders_adjustment_total.to_i %>&nbsp;<%= t("number.currency.format.unit") %></label>
+						    <label id="orders_adjustment_total"><%= number_to_currency(@orders_adjustment_total.round) %></label>
 						    <span><%= t('adjustments') %></span>
 					    </td>
 					    <td class="spacer">|</td>
 					    <td style="width:22%">
-						    <label id="orders_adjustment_total"><%= number_with_delimiter @orders_credit_total.to_i %>&nbsp;<%= t("number.currency.format.unit") %></label>
+						    <label id="orders_adjustment_total"><%= number_to_currency(@orders_credit_total.round) %></label>
 						    <span><%= t('credits') %></span>
 					    </td>
             </tr>

data/app/views/errors/404.html.erb

@@ -0,0 +1,7 @@
+<h1><%= t(:page_not_found) %></h1>
+
+<% content_for :sidebar do %>
+  <%= hook :taxon_sidebar_navigation do %>
+    <%= render :partial => "shared/taxonomies" %>
+  <% end %>
+<% end %>

data/config/locales/ru.yml

@@ -1,5 +1,6 @@
 ru:
   cash_on_delivery: "Наложенный платёж"
+  page_not_found: "Страница не найдена"
 
   activerecord:
     attributes:

data/lib/ext/number_helper.rb

@@ -0,0 +1,6 @@
+ActionView::Helpers::NumberHelper.module_eval do
+  def number_to_currency_with_synergy(number, options = {})
+    number_to_currency_without_synergy(number, options).gsub(' ', "\302\240")
+  end
+  alias_method_chain :number_to_currency, :synergy
+end

data/lib/synergy.rb

@@ -1,6 +1,7 @@
 # coding: utf-8
 require 'spree_core'
 require 'synergy_hooks'
+require 'ext/number_helper'
 
 module Synergy
   class Engine < Rails::Engine
@@ -23,6 +24,7 @@ module Synergy
         Spree::Config.set(:default_country_id => 168)
         Spree::Config.set(:allow_ssl_in_production => false)
         Spree::Config.set(:disable_bill_address => true)
+        Spree::Config.set(:admin_interface_logo => "admin/logo.png")
         checkout_zone = Zone.first
         Spree::Config.set(:checkout_zone => checkout_zone.name) if checkout_zone
       end
@@ -35,7 +37,7 @@ module Synergy
           self.parameterize
         end
      	end
-      
+     	
       # зарегистрировать калькулятор для доставки наложенным платежём
       Calculator::CashOnDelivery.register
       

data/public/javascripts/admin/inline_help.js

@@ -20,8 +20,7 @@ fields = {
    payment_method_name: "Для отображения в магазине.",
    payment_method_description: "Дополнительное описание, показывается покупателю<br />на шаге выбора способа оплаты.",
    payment_method_display_on: "Везде: способ будет доступен как покупателю, так и администратору.<br />В публичном интерфейсе: способ будет доступен только покупателю.<br />В административном интерфейсе: способ будет доступен только администратору при редактировании заказа вручную.",
-   taxonomy_name: "Для отображения в магазине.",   
-   'calc-type': "Правило расчета стоимости доставки.",
+   taxonomy_name: "Для отображения в магазине.",
    shipping_method_display_on: "Везде: способ будет доступен как покупателю, так и администратору.<br />В публичном интерфейсе: способ будет доступен только покупателю.<br />В административном интерфейсе: способ будет доступен только администратору при редактировании заказа вручную.",
    shipping_method_name: "Для отображения в магазине.",
    promotion_name: "Для отображения в магазине.",

data/public/stylesheets/admin/synergy.css

@@ -6,3 +6,93 @@ ul#shipping-specs li {
   display: block;
   list-style-image: none;
 }
+
+#content {
+  position: relative;
+}
+
+input.format-y-m-d { width: 90% }
+
+body {
+  background-color: #bbb;
+}
+
+h1 {
+  font-weight: normal;
+  font-size: 18pt;
+}
+
+h2 {
+  font-weight: normal;
+}
+
+#logo {
+  margin-top: 30px;
+}
+
+#header h1 a {
+  color: white;
+  
+}
+
+#login-nav {
+  color: black;
+  font-weight: bold;
+}
+
+#login-nav a {
+  color: black;
+  font-weight: normal;
+}
+
+#login-nav a:hover {
+  text-decoration: underline;
+}
+
+#admin-menu {
+  background: url("../../images/admin/bg/admin_menu_back.png") repeat-x scroll left top;
+  border-bottom: none;
+  border-right: none;
+  border-top: 1px solid white;
+}
+
+#admin-menu ul li:first-child {
+  border-left: none;
+}
+
+#admin-menu ul li a {
+  color: black;
+}
+
+#admin-menu ul li.selected a {
+  color: white;
+  background-color: transparent;
+}
+
+#admin-menu ul li.selected {
+  border-style: none;
+  border-top: 1px solid black;
+  background: #3d3d3d;
+}
+
+#sub-menu {
+  background: url("../../images/admin/bg/admin_sub_menu_back.png") repeat-x scroll left top;
+  border-top: 1px solid black;
+  box-shadow: #A1A1A1 0 -1px 0;
+  border-left: none;
+  border-right: none;
+}
+
+#sub-menu ul li a {
+  color: white;
+  margin: 8px 5px;
+}
+
+#sub-menu ul li.selected a {
+  color: #00d1fc;
+  text-shadow: #3a3a3a 0 1px 0;
+  background: #595959;
+  border: 1px solid #333;
+  border-right-color: #999;
+  border-bottom-color: #999;
+}

data/synergy.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'synergy'
-  s.version     = '0.50.0.rc2'
+  s.version     = '0.50.0'
   s.summary     = 'Russian e-commerce solution based on Spree'
   #s.description = 'Add (optional) gem description here'
   s.required_ruby_version = '>= 1.8.7'
@@ -25,6 +25,6 @@ Gem::Specification.new do |s|
   s.add_dependency('spree_robokassa', '~> 0.50.0')
   s.add_dependency('spree_yandex_market', '~> 1.2.0')
   s.add_dependency('spree_online_support', '~> 0.50.0')
-  s.add_dependency('spree_address_book', '~> 0.50.0')
+  s.add_dependency('spree_address_book', '~> 0.50.1')
   s.add_dependency('spree_dynamic_sitemaps', '~> 0.50.1')
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: synergy
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  prerelease: false
   segments: 
   - 0
   - 50
   - 0
-  - rc2
-  version: 0.50.0.rc2
+  version: 0.50.0
 platform: ruby
 authors: 
 - Roman Smirnov
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-06 00:00:00 +04:00
+date: 2011-05-12 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -154,8 +153,8 @@ dependencies:
         segments: 
         - 0
         - 50
-        - 0
-        version: 0.50.0
+        - 1
+        version: 0.50.1
   type: :runtime
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
@@ -187,11 +186,14 @@ files:
 - Rakefile
 - app/controllers/admin/products_controller_decorator.rb
 - app/controllers/checkout_controller_decorator.rb
+- app/controllers/spree/base_controller_decorator.rb
+- app/controllers/user_sessions_controller_decorator.rb
 - app/models/calculator/cash_on_delivery.rb
 - app/models/order_decorator.rb
 - app/models/taxon_decorator.rb
 - app/views/admin/overview/index.html.erb
 - app/views/admin/products/index.html.erb
+- app/views/errors/404.html.erb
 - app/views/order_mailer/cancel_email.text.erb
 - app/views/order_mailer/confirm_email.text.erb
 - app/views/shared/_filters.html.erb
@@ -216,11 +218,15 @@ files:
 - db/sample/preferences.yml
 - db/sample/shipping_categories.yml
 - db/sample/shipping_methods.yml
+- lib/ext/number_helper.rb
 - lib/synergy.rb
 - lib/synergy_hooks.rb
 - lib/tasks/install.rake
 - lib/tasks/synergy.rake
+- public/images/admin/bg/admin_menu_back.png
+- public/images/admin/bg/admin_sub_menu_back.png
 - public/images/admin/icons/help.png
+- public/images/admin/logo.png
 - public/javascripts/admin/inline_help.js
 - public/javascripts/admin/jquery.simpletip-1.3.1.pack.js
 - public/stylesheets/admin/inline_help.css
@@ -247,13 +253,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: 
 - none
 rubyforge_project: