synergy 0.60.0.RC1 → 0.60.0

data/README.md

@@ -7,9 +7,9 @@ Synergy
 Установка
 =========
 
-1. Установите Rails 3.0.7
+1. Установите Rails 3.0.9
     
-        gem install rails -v 3.0.7
+        gem install rails -v 3.0.9
     
 1. Создайте новое приложение
     
@@ -18,19 +18,11 @@ Synergy
 1. Настройте подключение к базе данных (рекомендуется MySQL с адаптером mysql2)
 1. Добавьте в Gemfile следующие строки:
     
-        gem 'mysql2', '0.2.7'
-        gem 'russian', :git => 'git://github.com/yaroslav/russian.git'
-        gem 'spree', '~> 0.60.0'
+        gem 'mysql2', '~> 0.2.7'
+        gem 'spree', :git => 'git://github.com/spree/spree.git', :branch => '0-60-stable'
         gem 'spree_i18n', :git => 'git://github.com/spree/spree_i18n.git'
-        gem 'spree_static_content'
-        gem 'spree_editor'
-        gem 'spree_online_support'
-        gem 'spree_robokassa'
-        gem 'spree_yandex_market'
-        gem 'spree_address_book'
-        gem 'spree_dynamic_sitemaps'
-        gem 'synergy', '~> 0.50.0'
-        gem 'synergy_default_theme', '1.0.1'
+        gem 'synergy', '~> 0.60.0'
+        gem 'synergy_default_theme', '~> 1.0.2'
     
 1. Выполните следующие команды:
     
@@ -41,7 +33,6 @@ Synergy
         rake synergy_default_theme:install
         rake db:migrate
         rake db:seed db:sample
-        rake db:admin:create
         rails s
 
 

data/app/controllers/addresses_controller_decorator.rb

@@ -0,0 +1,3 @@
+AddressesController.class_eval do
+  helper :checkout
+end

data/app/controllers/checkout_controller_decorator.rb

@@ -3,6 +3,7 @@ CheckoutController.class_eval do
 
   def after_payment
     if @order.shipping_method.calculator.is_a?(Calculator::CashOnDelivery)
+      @order.payments.build(:payment_method => PaymentMethod.internal, :amount => @order.total)
       @order.confirm_without_payment!
     end
   end

data/app/models/payment_method_decorator.rb

@@ -0,0 +1,14 @@
+# coding: utf-8
+PaymentMethod.class_eval do
+  def self.internal
+    pm = PaymentMethod.where(:environment => Rails.env, 
+                             :display_on => "back_end", 
+                             :type => "PaymentMethod::Check", 
+                             :active => true).first
+    
+    pm ||= PaymentMethod::Check.create(:environment => Rails.env, 
+                                :name => "Для внутренних расчётов", 
+                                :display_on => "back_end", :active => true)  
+    pm
+  end
+end

data/app/views/admin/shared/_tabs.html.erb

@@ -1,6 +1,11 @@
 <%= tab :overview, :route => :admin %>
-<%= tab :orders, :payments, :creditcard_payments, :shipments, :creditcards, :return_authorizations %>
-<%= tab :products , :option_types, :properties, :prototypes, :variants, :product_properties, :taxons, :product_groups, :reviews, :vasia %>
+<%= tab :orders, :payments, :creditcard_payments, :shipments, :creditcards, 
+        :return_authorizations %>
+<%= tab :products, :option_types, :properties, :prototypes, :variants, :product_properties, 
+        :taxons, :product_groups, :reviews, :images %>
 <%= tab :reports %>
-<%= tab :configurations, :general_settings, :mail_methods, :tax_categories, :zones, :states, :payment_methods, :inventory_settings, :taxonomies, :shipping_methods, :trackers, :editor_settings, :online_support_settings, :authentication_methods, :label => 'configuration' %>
-<%= tab :users %>
+<%= tab :configurations, :general_settings, :mail_methods, :tax_categories, :zones, 
+        :states, :payment_methods, :inventory_settings, :taxonomies, :shipping_methods, 
+        :trackers, :editor_settings, :online_support_settings, :authentication_methods, 
+        :label => 'configuration' %>
+<%= tab :users %>

data/app/views/admin/shipments/_form.html.erb

@@ -0,0 +1,73 @@
+<% unless @shipment.order.cart? %>
+  <table class="index" style="width:100%;" data-hook="admin_shipment_form_inventory_units">
+    <tr>
+      <th width="130px"><%= t('include_in_shipment') %></th>
+      <th><%= t('sku') %></th>
+      <th><%= t('item_description') %></th>
+      <th><%= t('status') %></th>
+      <th><%= t('note') %></th>
+    </tr>
+
+    <% @shipment.order.inventory_units.each do |inventory_unit| %>
+      <tr>
+        <td style="text-align:center;">
+          <%= check_box_tag "inventory_units[#{inventory_unit.id}]",
+                            :true,
+                            (inventory_unit.shipment == @shipment),
+                            { :disabled => %w(shipped backordered returned).include?(inventory_unit.state),
+                              :class => 'inventory_unit'} %>
+        </td>
+        <td valign="top" width="120px;"><%= inventory_unit.variant.sku %></td>
+        <td width="300">
+          <%=inventory_unit.variant.product.name %>
+          <%= "(" + variant_options(inventory_unit.variant) + ")" unless inventory_unit.variant.option_values.empty? %>
+        </td>
+        <td><%= t(inventory_unit.state) %></td>
+        <td>
+          <% if inventory_unit.shipment == @shipment %>
+            <%= t('included_in_this_shipment') %>
+          <% elsif !inventory_unit.shipment.nil? %>
+            <%= t('included_in_other_shipment') %> - <%= link_to inventory_unit.shipment.number, edit_admin_order_shipment_url(inventory_unit.order, inventory_unit.shipment) %>
+          <% end %>
+        </td>
+      </tr>
+    <% end %>
+  </table>
+<% end %>
+
+<div data-hook="admin_shipment_form_address">
+  <% shipment_form.fields_for 'address' do |sa_form|  %>
+    <%= render :partial => 'admin/shared/address_form', :locals => {:f => sa_form, :name => t("shipping_address"), :use_billing => false} %>
+  <% end %>
+</div>
+
+<div data-hook="admin_shipment_form_details">
+  <table class="index">
+    <tr>
+      <th colspan="8"><%= t("shipment_details") %></th>
+    </tr>
+    <tr>
+      <td>
+        <%= shipment_form.label :shipping_method_id, t('shipping_method') + ":" %>
+      </td>
+      <td>
+        <%= shipment_form.select :shipping_method_id,
+                                        @shipping_methods.map {|sm| ["#{sm.name} - #{sm.zone.name}", sm.id] } %>
+      </td>
+      <td>
+        <%= shipment_form.label :tracking, t('tracking') + ":" %>
+      </td>
+      <td><%= shipment_form.text_field :tracking %></td>
+    </tr>
+    <% if Spree::Config[:shipping_instructions] %>
+      <tr>
+        <td>
+          <%= shipment_form.label :special_instructions, t('special_instructions') + ":" %>
+        </td>
+        <td colspan="3">
+            <%= shipment_form.text_area :special_instructions %>
+        </td>
+      </tr>
+    <% end %>
+  </table>
+</div>

data/config/locales/ru.yml

@@ -28,7 +28,6 @@ ru:
         one: "Адрес"
         few: "Адреса"
         other: "Адресов"
-        
       adjustment:
         one: Надбавка
         other: Надбавки
@@ -38,6 +37,9 @@ ru:
       configuration:
         one: Конфигурация
         other: Конфигурации
+      image:
+        one: Изображение
+        other: Изображения
       mail_method:
         one: Метод отправки почты
         other: Методы отправки почты

data/lib/synergy.rb

@@ -1,5 +1,20 @@
 # coding: utf-8
 require 'spree_core'
+require 'spree_auth'
+require 'spree_api'
+require 'spree_dash'
+require 'spree_promo'
+require 'spree_i18n'
+require 'spree_static_content'
+require 'spree_editor'
+require 'spree_online_support'
+require 'spree_robokassa'
+require 'spree_yandex_market'
+require 'spree_address_book'
+require 'spree_dynamic_sitemaps'
+require 'formtastic'
+require 'russian'
+
 require 'synergy_hooks'
 require 'ext/number_helper'
 
@@ -35,8 +50,8 @@ module Synergy
         #Spree::Config.set(:store_address => 'Somewhere st. Nowhere')
       end
       
-      ADDRESS_FIELDS.clear << ["lastname", "firstname", "secondname", "country", "state", "city", "zipcode", "address1", "phone"]
-      ADDRESS_FIELDS.flatten!
+      ::ADDRESS_FIELDS.clear << ["lastname", "firstname", "secondname", "country", "state", "city", "zipcode", "address1", "phone"]
+      ::ADDRESS_FIELDS.flatten!
 
       String.class_eval do
         def to_url

data/public/stylesheets/admin/synergy.css

@@ -105,3 +105,5 @@ a.button span, .actions a {
 .toolbar {
   margin-bottom: 0;
 }
+
+#content form textarea { border: 1px solid #BBB; height: 150px; }

data/synergy.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'synergy'
-  s.version     = '0.60.0.RC1'
+  s.version     = '0.60.0'
   s.summary     = 'Russian e-commerce solution based on Spree'
   s.description = ''
   s.required_ruby_version = '>= 1.8.7'

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: synergy
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  prerelease: false
   segments: 
   - 0
   - 60
   - 0
-  - RC1
-  version: 0.60.0.RC1
+  version: 0.60.0
 platform: ruby
 authors: 
 - Roman Smirnov
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-25 00:00:00 +04:00
+date: 2011-07-05 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -185,6 +184,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- app/controllers/addresses_controller_decorator.rb
 - app/controllers/admin/base_controller_decorator.rb
 - app/controllers/admin/orders_controller_decorator.rb
 - app/controllers/admin/products_controller_decorator.rb
@@ -196,13 +196,14 @@ files:
 - app/models/calculator/cash_on_delivery.rb
 - app/models/order_decorator.rb
 - app/models/payment_method/sber_bank_invoice.rb
-- app/models/taxon_decorator.rb
+- app/models/payment_method_decorator.rb
 - app/views/admin/orders/courier_instruction.html.erb
 - app/views/admin/overview/index.html.erb
 - app/views/admin/payments/source_forms/_sberbankinvoice.html.erb
 - app/views/admin/payments/source_views/_sberbankinvoice.html.erb
 - app/views/admin/products/index.html.erb
 - app/views/admin/shared/_tabs.html.erb
+- app/views/admin/shipments/_form.html.erb
 - app/views/checkout/payment/_sberbankinvoice.html.erb
 - app/views/errors/404.html.erb
 - app/views/order_mailer/cancel_email.text.erb
@@ -271,13 +272,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: synergy

data/app/models/taxon_decorator.rb

@@ -1,3 +0,0 @@
-Taxon.class_eval do
-  before_update :set_permalink
-end