synergy 0.50.0 → 0.60.0.RC1

data/README.md

@@ -19,7 +19,8 @@ Synergy
 1. Добавьте в Gemfile следующие строки:
     
         gem 'mysql2', '0.2.7'
-        gem 'spree', '~> 0.50.2'
+        gem 'russian', :git => 'git://github.com/yaroslav/russian.git'
+        gem 'spree', '~> 0.60.0'
         gem 'spree_i18n', :git => 'git://github.com/spree/spree_i18n.git'
         gem 'spree_static_content'
         gem 'spree_editor'
@@ -28,7 +29,8 @@ Synergy
         gem 'spree_yandex_market'
         gem 'spree_address_book'
         gem 'spree_dynamic_sitemaps'
-        gem 'synergy', '~> 0.50.0.rc1'
+        gem 'synergy', '~> 0.50.0'
+        gem 'synergy_default_theme', '1.0.1'
     
 1. Выполните следующие команды:
     
@@ -36,8 +38,10 @@ Synergy
         rails g spree:site -f
         rake spree:install
         rake synergy:install
+        rake synergy_default_theme:install
         rake db:migrate
         rake db:seed db:sample
+        rake db:admin:create
         rails s
 
 

data/app/controllers/admin/base_controller_decorator.rb

@@ -0,0 +1,16 @@
+# coding: utf-8
+Admin::BaseController.class_eval do
+  def flash_message_for(object, event_sym)
+    resource_i18n_class_name = object.class.model_name.human.mb_chars
+    resource_desc = resource_i18n_class_name
+    resource_desc += " \"#{object.name}\"" if object.respond_to?(:name)
+    
+    if (resource_i18n_class_name =~ /[ое](\s|$)/)
+      I18n.t("it_#{event_sym}", :resource => resource_desc)
+    elsif (resource_i18n_class_name =~ /[ая](\s|$)/)
+      I18n.t("she_#{event_sym}", :resource => resource_desc)
+    else
+      I18n.t(event_sym, :resource => resource_desc)
+    end
+  end
+end

data/app/controllers/admin/orders_controller_decorator.rb

@@ -0,0 +1,6 @@
+Admin::OrdersController.class_eval do
+  def courier_instruction
+    @order = Order.find_by_number(params[:id])
+    render :layout => false
+  end
+end

data/app/controllers/admin/products_controller_decorator.rb

@@ -26,9 +26,9 @@ Admin::ProductsController.class_eval do
       end
 
       taxon_name = doc.css(".b-breadcrumbs a").last.content
-      price = doc.css(".price span").first.content.gsub(nbsp, '')
+      price = doc.css(".b-model-prices__avg span").first.content.gsub(nbsp, '')
       image_urls = doc.css("#model-pictures a").map{|link| link['href'] }
-      name = doc.css("#global-model-name").first.content
+      name = doc.css(".b-page-title").first.content
 
       p = Product.new(:name => name, :price => price)
       p.available_on = Time.now if params[:available]
@@ -50,8 +50,9 @@ Admin::ProductsController.class_eval do
           flash[:notice] = "Данные о товаре \"#{p.name}\" успешно скачены с Яндекс.Маркет"
         end
       end
-    rescue
-      flash[:error] = "Данные о товаре не удалось взять с Яндекс.Маркет, проверьте ID товара и наличие полной информации о нём по ссылке #{market_url}"
+    rescue Exception => error
+      flash[:notice] = "Данные о товаре не удалось взять с Яндекс.Маркет, проверьте ID товара и наличие полной информации о нём по ссылке #{market_url}."
+      flash[:error] = error.backtrace.find{|line| line =~ /#{__FILE__}/}.to_s + "(#{$!})"
     end
     redirect_to admin_products_path
   end

data/app/controllers/checkout_controller_decorator.rb

@@ -3,8 +3,7 @@ CheckoutController.class_eval do
 
   def after_payment
     if @order.shipping_method.calculator.is_a?(Calculator::CashOnDelivery)
-      @order.complete_without_payment!
-      after_complete
+      @order.confirm_without_payment!
     end
   end
 end

data/app/controllers/orders_controller_decorator.rb

@@ -0,0 +1,7 @@
+OrdersController.class_eval do
+  def sberbank_invoice
+    @order = Order.find_by_number(params[:id])
+    @preferences = @order.payment_method.preferences
+    render :layout => false
+  end
+end

data/app/helpers/checkout_helper.rb

@@ -0,0 +1,32 @@
+module CheckoutHelper
+
+  def checkout_states
+    %w(address delivery payment confirm) 
+  end
+
+  # TODO: this can be deleted from extension after Spree 0.70.0 release
+  def checkout_progress
+    states = checkout_states
+    items = states.map do |state|
+      text = t("order_state.#{state}").titleize
+
+      css_classes = []
+      current_index = states.index(@order.state)
+      state_index = states.index(state)
+
+      if state_index < current_index
+        css_classes << 'completed'
+        text = link_to text, checkout_state_path(state)
+      end
+
+      css_classes << 'next' if state_index == current_index + 1
+      css_classes << 'current' if state == @order.state
+      css_classes << 'first' if state_index == 0
+      css_classes << 'last' if state_index == states.length - 1
+      # It'd be nice to have separate classes but combining them with a dash helps out for IE6 which only sees the last class
+      content_tag('li', content_tag('span', text), :class => css_classes.join('-'))
+    end
+    content_tag('ol', raw(items.join("\n")), :class => 'progress-steps', :id => "checkout-step-#{@order.state}")
+  end
+
+end

data/app/models/payment_method/sber_bank_invoice.rb

@@ -0,0 +1,14 @@
+class PaymentMethod::SberBankInvoice < PaymentMethod::Check
+  preference :recipient, :string
+  preference :inn, :string
+  preference :kpp, :string
+  preference :corr, :string
+  preference :bik, :string
+  preference :settlement_acc, :string
+  preference :recipient_bank, :string
+  preference :recipient_bank_city, :string
+
+  def desc
+    "<p>#{I18n.t('sberbank_invoice')}</p>".html_safe
+  end
+end

data/app/views/admin/orders/courier_instruction.html.erb

@@ -0,0 +1,68 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Товарный чек</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+
+  <link rel="shortcut icon" type="image/vnd.microsoft.icon" href="/favicon.ico">
+  <link rel="icon" type="image/png" href="/favicon.png"/>
+
+  <%= stylesheet_link_tag 'reset' %>
+  <%= stylesheet_link_tag 'courier_instruction', :media => :all %>
+
+</head>
+<body>
+<div id="main">
+  <header>
+    <div id="header">
+      <h1><%= Spree::Config[:site_name] %></h1>
+
+      <div class="site_url"><%= Spree::Config[:site_url] %></div>
+      <div class="store_email"><%= Spree::Config[:store_email] %></div>
+      <div class="store_phone"><%= Spree::Config[:store_phone] %></div>
+      
+    </div>
+  </header>
+  <section>
+    <div id="content">
+      <h1>Заказ №<%= @order.number %> от <%= Russian::strftime(@order.completed_at, "%d %B %Y г.") %></h1>
+
+      <h2>Адрес доставки:</h2>
+      <div><%= @order.ship_address.address1 %></div>
+
+      <h2>Контактное лицо:</h2>
+      <div><%= @order.ship_address.full_name %></div>
+      <div><%= @order.ship_address.phone %></div>
+
+      <table class="order_line_items" cellspacing="0" cellpadding="0" style="border-collapse: collapse;">
+        <colgroup>
+          <col width="50"/>
+          <col/>
+          <col width="100"/>
+        </colgroup>
+        <tr>
+          <th>№</th>
+          <th>Наименование товара</th>
+          <th>Кол-во</th>
+        </tr>
+        <% if @order.line_items.any? %>
+        <% @order.line_items.each_with_index do |li, index| %>
+        <tr>
+          <td><%= index + 1 %></td>
+          <td><%= li.product.name %></td>
+          <td style="text-align: right"><%= li.quantity %></td>
+        </tr>
+        <% end %>
+        <% end %>
+      </table>
+      <div id="total_desc">Всего наименований: <%= @order.line_items.count %></div>
+      <div id="seller">
+        <div id="order_delivered">Заказ доставил&nbsp;________________/______________/ &nbsp; "___" __________ 2011</div>
+        <div id="order_recieved">Заказ получил&nbsp;&nbsp;________________/______________/ &nbsp; "___" __________ 2011</div>
+      </div>
+    </div>
+  </section>
+</div>
+<script type="text/javascript"> window.print(); </script>
+</body>
+</html>

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

@@ -0,0 +1,6 @@
+<%= 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 :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 %>

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

@@ -1,5 +1,16 @@
 <h1><%= t(:page_not_found) %></h1>
 
+<p>Запрошенному вами URL не соответствует ни одна страница сайта.</p>
+<p>Возможные причины:</p>
+<ul>
+	<li>Вам могли прислать неверную ссылку.</li>
+	<li>Вы могли набрать адрес с ошибкой.</li>
+	<li>Страница могла быть удалена с изменением структуры сайта.</li>
+	<li>Товар более недоступен для продажи.</li>
+</ul>
+
+<p>Если вы уверены, что адрес правильный, попробуйте начать поиск информации с <%= link_to 'главной страницы сайта', '/' %></p>
+
 <% content_for :sidebar do %>
   <%= hook :taxon_sidebar_navigation do %>
     <%= render :partial => "shared/taxonomies" %>

data/app/views/orders/sberbank_invoice.html.erb

@@ -0,0 +1,74 @@
+<html>
+<header>
+<style>
+td{font:normal 12px/140% Verdana,Geneva, sans-serif;
+color:#000;
+padding:5px;
+text-align:left;}
+.kvit{border:1px solid #000;
+border-collapse:collapse;
+width:650px;}
+.kvit .dashed{border:1px solid #000;
+border-bottom:1px dashed #000;
+border-collapse:collapse;}
+.kvit .nodashed{border:1px solid #000;
+border-top:none;
+border-collapse:collapse;}
+table{border:1px solid #8a8a8a;
+border-collapse:collapse;
+width:415px;}
+table td{border:1px solid #8a8a8a;
+border-collapse:collapse;}
+.comment{border-top:1px solid #8a8a8a;
+margin:3px 0 10px;}
+</style>
+</header>
+<body>
+<table cellpadding="3" class="kvit">
+  <% 2.times do %>
+  <tr>
+    <td align="left" width="230" class="dashed">
+      &nbsp;&nbsp;<b>КВИТАНЦИЯ</b>
+      <%== '<br />' * 14 %>
+      &nbsp;&nbsp;Кассир<br /><br />
+    </td>
+    <td align="right" width="415" class="dashed">
+    <table border="0" cellpadding="0">
+      </tr>
+        <td colspan="3">
+          Получатель платежа: <%= @preferences['recipient'] %><br />
+          ИНН <%= @preferences['inn'] %> / КПП <%= @preferences['kpp'] %><br />
+          Корр.сч. <%= @preferences['corr'] %> БИК <%= @preferences['bik'] %><br />
+          Расч. сч. <%= @preferences['settlement_acc'] %> в <%= @preferences['recipient_bank'] %>, г.&nbsp;<%= @preferences['recipient_bank_city'] %>
+        </td>
+      </tr>
+      <tr>
+        <td COLSPAN="3"><%= @order.ship_address.zipcode %>, г.&nbsp;<%= @order.ship_address.city %>, <%= [@order.ship_address.address1, @order.ship_address.address2].join %>
+        <div align="center" class="comment"><small>Адрес плательщика</small></div>
+        </td>
+      </tr>
+      <tr>
+        <td align="center">Вид платежа</td>
+        <td align="center">Дата</td>
+        <td align="center">Сумма</td>
+      </tr>
+      <tr>
+        <td align="left">Оплата заказа № <%= @order.number %></td>
+        <td width="" valign="bottom"><%= Time.now.strftime("%d.%m.%Y") %></td>
+        <td width="" valign="bottom"><%= @order.total.to_i %>&nbsp;руб.&nbsp;00&nbsp;коп.</td>
+      </tr>
+      <tr>
+        <td colspan="3" valign="center"><br><small>Плательщик (ФИО, подпись):</small>&nbsp;<em><%= [@order.ship_address.lastname, @order.shipment.address.firstname, @order.shipment.address.secondname].join(' ') %></em></td>
+      </tr>
+    </table>
+    </td>
+  </tr>
+  <% end %>
+</table><script language="JavaScript" type="text/JavaScript">
+//setTimeout('window.print()',1000);
+</script>
+</body>
+</html>
+
+
+

data/app/views/orders/show.html.erb

@@ -0,0 +1,17 @@
+<h1><%= accurate_title %></h1>
+
+<div id="order">
+  <% if params.has_key? :checkout_complete %>
+  	<h3><%= t('thank_you_for_your_order') %></h3>
+  <% end %>
+  <%= render :partial => 'shared/order_details', :locals => {:order => @order} %>
+  <p>
+    <%= link_to t('back_to_store'), root_path %>
+    <% unless params.has_key? :checkout_complete %>
+    	| <%= link_to t('my_account'), account_path if current_user%>
+    <% end %>
+  </p>
+  <% if @order.payment_method.is_a?(PaymentMethod::SberBankInvoice) %>
+  <%= link_to t('print_sberbank_invoice'), orders_sberbank_invoice_path %>
+  <% end %>
+</div>

data/app/views/user_mailer/reset_password_instructions.text.erb

@@ -0,0 +1,11 @@
+Добрый день.
+
+С вашего адреса был сделан запрос на сброс пароля.
+Если вы этого не делали, проигнорируйте это письмо.
+
+Если вы действительно запрашивали сброс пароля, перейдите по ссылке ниже:
+
+<%= @edit_password_reset_url %>
+
+Если ссылка не открывается, попробуйте скопировать ее и вставить в адресную строку вашего браузера.
+Если вам не удалось сбросить пароль, свяжитесь пожалуйста с администрацией магазина.

data/config/locales/ru.yml

@@ -1,6 +1,16 @@
 ru:
   cash_on_delivery: "Наложенный платёж"
+  sberbank_invoice: "Квитанция СберБанка"
   page_not_found: "Страница не найдена"
+  courier_instructions: "Поручение курьеру"
+
+  it_successfully_created: "%{resource} успешно создано!"
+  it_successfully_removed: "%{resource} успешно удалено!"
+  it_successfully_updated: "%{resource} успешно обновлено!"
+
+  she_successfully_created: "%{resource} успешно создана!"
+  she_successfully_removed: "%{resource} успешно удалена!"
+  she_successfully_updated: "%{resource} успешно обновлена!"
 
   activerecord:
     attributes:
@@ -18,6 +28,59 @@ ru:
         one: "Адрес"
         few: "Адреса"
         other: "Адресов"
+        
+      adjustment:
+        one: Надбавка
+        other: Надбавки
+      calculator:
+        one: Калькулятор
+        other: Калькуляторы
+      configuration:
+        one: Конфигурация
+        other: Конфигурации
+      mail_method:
+        one: Метод отправки почты
+        other: Методы отправки почты
+      option_type:
+        one: Тип опции
+        other: Типы опций
+      option_value:
+        one: Значение опции
+        other: Значения опции
+      page:
+        one: Страница
+        other: Страницы
+      payment_method:
+        one: Способ оплаты
+        other: Способы оплаты
+      preference:
+        one: Настройка
+        other: Настройки
+      product_option_type:
+        one: Тип опции продукта
+        other: Типы опций продукта
+      product_property:
+        one: Свойство товара
+        other: Свойства товара
+      product_scope:
+        one: Фильтр
+        other: Фильтры
+      promotion:
+        one: Промо-акция
+        other: Промо-акции
+      promotion_rule:
+        one: Правило промо-акции
+        other: Правила промо-акции
+      shipping_method:
+        one: Способ доставки
+        other: Способы доставки
+      tracker:
+        one: Трекер
+        other: Трекеры
+
+  errors:
+    messages:
+      blank: "не может быть пустым"
 
   errors_prohibited_this_record_from_being_saved: 
     one: "1 ошибка не позволяет сохранить запись в базе"

data/config/locales/sberbank_ru.yml

@@ -0,0 +1,10 @@
+ru:
+  recipient: Получатель платежа
+  inn: ИНН
+  kpp: КПП
+  corr: Корр.сч.
+  bik: БИК
+  settlement_acc: Расч. сч.
+  recipient_bank: Банк получатель
+  recipient_bank_city: Город банка получателя
+  print_sberbank_invoice: Напечатать квитанцию Сбербанка

data/config/routes.rb

@@ -1,4 +1,6 @@
 Rails.application.routes.draw do
   # Add your extension routes here
   match "/admin/products/import_from_yandex_market" => "admin/products#import_from_yandex_market", :as => :import_from_yandex_market
+  match "/admin/orders/:id/courier_instruction" => "admin/orders#courier_instruction", :as => :orders_courier_instruction
+  match "/orders/:id/sberbank_invoice" => "orders#sberbank_invoice", :as => :orders_sberbank_invoice
 end

data/lib/ext/number_helper.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 ActionView::Helpers::NumberHelper.module_eval do
   def number_to_currency_with_synergy(number, options = {})
     number_to_currency_without_synergy(number, options).gsub(' ', "\302\240")

data/lib/synergy.rb

@@ -27,6 +27,12 @@ module Synergy
         Spree::Config.set(:admin_interface_logo => "admin/logo.png")
         checkout_zone = Zone.first
         Spree::Config.set(:checkout_zone => checkout_zone.name) if checkout_zone
+        # store email address
+        Spree::Config.set(:store_email => 'test@site.ru') unless Spree::Config[:store_email]
+        # store phone
+        Spree::Config.set(:store_phone => '+7 (495) 1234567') unless Spree::Config[:store_phone]
+        # store address
+        #Spree::Config.set(:store_address => 'Somewhere st. Nowhere')
       end
       
       ADDRESS_FIELDS.clear << ["lastname", "firstname", "secondname", "country", "state", "city", "zipcode", "address1", "phone"]
@@ -41,10 +47,21 @@ module Synergy
       # зарегистрировать калькулятор для доставки наложенным платежём
       Calculator::CashOnDelivery.register
       
-      # добавить событие для перехода от шага доставки к шагу завершения, минуя шаг оплаты
-      complete_event = StateMachine::Event.new(Order.state_machine, :complete_without_payment)
-      complete_event.transition(:to => 'complete')
-      Order.state_machine.events << complete_event
+      PaymentMethod::SberBankInvoice.register
+      
+      # добавить событие для перехода от шага доставки к шагу подтверждения, минуя шаг оплаты
+      confirm_event = StateMachine::Event.new(Order.state_machine, :confirm_without_payment)
+      confirm_event.transition :to => 'confirm'
+      Order.state_machine.events << confirm_event
+      
+      # переопределение события :next для отображения шага подтверждения в любом случае
+      next_event = StateMachine::Event.new(Order.state_machine, :next)
+      next_event.transition :from => 'cart',     :to => 'address'
+      next_event.transition :from => 'address',  :to => 'delivery'
+      next_event.transition :from => 'delivery', :to => 'payment'
+      next_event.transition :from => 'payment',  :to => 'confirm'
+      next_event.transition :from => 'confirm',  :to => 'complete'     
+      Order.state_machine.events << next_event
     end
 
     config.to_prepare &method(:activate).to_proc

data/lib/synergy_hooks.rb

@@ -1,4 +1,10 @@
 class SecointHooks < Spree::ThemeSupport::HookListener
+  insert_before :admin_order_show_buttons do
+    %(
+    <%= button_link_to t("courier_instructions"), orders_courier_instruction_path(@order) if @order.completed_at %>
+    )
+  end
+
   insert_after :admin_inside_head do
     %(
     <%= javascript_include_tag 'admin/inline_help.js', 'admin/jquery.simpletip-1.3.1.pack.js' %>

data/public/500.html

@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>500 Internal Server Error</title>
+  <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+  <style type="text/css">
+    body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
+    div.dialog {
+      width: 25em;
+      padding: 0 4em;
+      margin: 4em auto 0 auto;
+      border: 1px solid #ccc;
+      border-right-color: #999;
+      border-bottom-color: #999;
+    }
+    h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
+  </style>
+</head>
+
+<body>
+  <!-- This file lives in public/500.html -->
+  <div class="dialog">
+    <h1>500 Internal Server Error</h1>
+    <p>В процессе обработки вашего запроса произошла неожиданная ошибка сервера.</p>
+    <p><a href='/'>Вернуться в интернет-магазин</a></p>
+  </div>
+</body>
+</html>

data/public/javascripts/admin/inline_help.js

@@ -34,8 +34,11 @@ fields = {
 
 function register_help() {
   jQuery.each(fields, function(element_id, help_msg) {
-    jQuery('label[for='+element_id+']').after("&nbsp;<span class='help' id='help_"+element_id+"'><img src='/images/admin/icons/help.png' alt='help' /></span>");
-    jQuery('#help_'+element_id).simpletip({ position: 'right', offset: [-10, -230], content: help_msg});
+    if (jQuery('#help_'+element_id).length == 0)
+    {
+      jQuery('label[for='+element_id+']').append("&nbsp;<span class='help' id='help_"+element_id+"'><img src='/images/admin/icons/help.png' alt='help' /></span>");
+      jQuery('#help_'+element_id).simpletip({ position: 'right', offset: [-10, -230], content: help_msg});
+    }
   });
 }
 

data/public/stylesheets/admin/inline_help.css

@@ -10,7 +10,7 @@
   font-family: sans-serif;
   font-size: 12px;
   line-height: 18px;
-  text-align: center;
+  text-align: left;
 }
 
 .tooltip h3{

data/public/stylesheets/admin/synergy.css

@@ -9,6 +9,7 @@ ul#shipping-specs li {
 
 #content {
   position: relative;
+  min-height: 640px;
 }
 
 input.format-y-m-d { width: 90% }
@@ -96,3 +97,11 @@ h2 {
   border-right-color: #999;
   border-bottom-color: #999;
 }
+
+a.button span, .actions a {
+  white-space: nowrap;
+}
+
+.toolbar {
+  margin-bottom: 0;
+}

data/public/stylesheets/courier_instruction.css

@@ -0,0 +1,136 @@
+/* ----- */
+
+html, body {
+ height: 100%;
+}
+body {
+ font-family: 'Verdana', sans-serif;
+ color: black;
+ font-size: 15px;
+ line-height: 1.4em;
+}
+
+div, img {
+ position: relative;
+}
+
+#main {
+ width: 900px;
+ margin: 0 auto;
+}
+
+@media print {
+
+	#main {
+	 width: 100%;
+	 margin: 0 auto;
+	}
+
+}
+
+h1, h2, h3, h4, h5, h6 {
+  font-family: "Times New Roman", serif
+}
+h1 { font-size: 24px; text-align: center; font-weight: bold; }
+h2 { font-size: 18px; }
+h3 { font-size: 16px; }
+h4 { font-size: 14px; }
+h5 { font-size: 12px; }
+h6 { font-size: 10px; }
+
+h1, h2, h3, h4, h5, h6, p, hr, ul, ol {
+ margin: 15px 0 10px 0;
+}
+
+a {
+ text-decoration: underline;
+ color: #0000ff;
+ outline-style: none;
+}
+a:hover {
+ text-decoration: none;
+}
+
+b, strong {
+ font-weight: bold;
+}
+
+#content table {
+ width: 100%;
+}
+
+#content td, #content th {
+ border: 1px solid #000;
+ border-collapse: collapse;
+ border-spacing: 0;
+}
+
+#content td {
+ padding: 3px 8px;
+}
+#content th {
+ font-weight: bold;
+ font-size: 16px;
+ padding: 3px 8px;
+}
+
+#content .default, #content .default th, #content .default td {
+ margin: 0;
+ padding: 0;
+ border-style: none;
+}
+
+#header {
+ height: 140px;
+}
+
+#header h1 {
+ text-align: left;
+}
+#logo {
+ position: absolute;
+ left: 5px;
+ top: 45px;
+}
+#header_adress {
+ position: absolute;
+ left: 134px;
+ top: 44px;
+ font-size: 18px;
+}
+
+#total {
+ text-align: right;
+ font-size: 16px;
+ font-weight: bold;
+ padding: 3px 8px 3px 0;
+}
+#total span {
+ padding-right: 25px;
+}
+#total_desc {
+ font-size: 16px;
+}
+#total_words {
+ margin: 5px 0 20px 0;
+ font-weight: bold;
+ font-size: 16px;
+}
+#seller_line {
+ position: absolute;
+ left: 70px;
+ bottom: 3px;
+ width: 230px;
+ border-bottom: 1px solid #000;
+}
+.order_line_items {
+ margin: 1em 0;
+}
+
+#seller {
+ margin-top: 2em;
+}
+
+#seller div {
+ margin: 1em 0;
+}

data/public/stylesheets/reset.css

@@ -0,0 +1,42 @@
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed, 
+figure, figcaption, footer, header, hgroup, 
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
+	margin: 0;
+	padding: 0;
+	border: 0;
+	font-size: 100%;
+	font: inherit;
+}
+/* HTML5 display-role reset for older browsers */
+article, aside, details, figcaption, figure, 
+footer, header, hgroup, menu, nav, section {
+	display: block;
+}
+body {
+	line-height: 1;
+}
+ol, ul {
+	list-style: none;
+}
+blockquote, q {
+	quotes: none;
+}
+blockquote:before, blockquote:after,
+q:before, q:after {
+	content: '';
+	content: none;
+}
+table {
+	border-collapse: collapse;
+	border-spacing: 0;
+}

data/synergy.gemspec

@@ -1,28 +1,28 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'synergy'
-  s.version     = '0.50.0'
+  s.version     = '0.60.0.RC1'
   s.summary     = 'Russian e-commerce solution based on Spree'
-  #s.description = 'Add (optional) gem description here'
+  s.description = ''
   s.required_ruby_version = '>= 1.8.7'
 
   s.author            = 'Roman Smirnov'
   s.email             = 'roman@railsdog.com'
   s.homepage          = 'https://github.com/secoint/synergy'
-  # s.rubyforge_project = 'actionmailer'
+  s.rubyforge_project = 'synergy'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  s.add_dependency('russian', '0.2.7')
-  s.add_dependency('json', '1.5.1')
-  s.add_dependency('nokogiri', '1.4.4')
-  s.add_dependency('spree', '>= 0.50.2')
-  s.add_dependency('spree_static_content', '~> 0.40.2')
-  s.add_dependency('spree_editor', '~> 0.50.0')
-  s.add_dependency('spree_robokassa', '~> 0.50.0')
+  s.add_dependency('synergy_russian', '0.2.8')
+  s.add_dependency('json', '~> 1.5.1')
+  s.add_dependency('nokogiri', '~> 1.4.4')
+  s.add_dependency('spree', '~> 0.60.0')
+  s.add_dependency('spree_static_content', '~> 0.60.1')
+  s.add_dependency('spree_editor', '~> 0.50.1')
+  s.add_dependency('spree_robokassa', '~> 0.50.2')
   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.1')

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: synergy
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
   - 0
-  - 50
+  - 60
   - 0
-  version: 0.50.0
+  - RC1
+  version: 0.60.0.RC1
 platform: ruby
 authors: 
 - Roman Smirnov
@@ -14,11 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-12 00:00:00 +04:00
+date: 2011-06-25 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: russian
+  name: synergy_russian
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
@@ -27,8 +28,8 @@ dependencies:
         segments: 
         - 0
         - 2
-        - 7
-        version: 0.2.7
+        - 8
+        version: 0.2.8
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -36,7 +37,7 @@ dependencies:
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 1
@@ -50,7 +51,7 @@ dependencies:
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 1
@@ -64,13 +65,13 @@ dependencies:
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 50
-        - 2
-        version: 0.50.2
+        - 60
+        - 0
+        version: 0.60.0
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -82,9 +83,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 40
-        - 2
-        version: 0.40.2
+        - 60
+        - 1
+        version: 0.60.1
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -97,8 +98,8 @@ dependencies:
         segments: 
         - 0
         - 50
-        - 0
-        version: 0.50.0
+        - 1
+        version: 0.50.1
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -111,8 +112,8 @@ dependencies:
         segments: 
         - 0
         - 50
-        - 0
-        version: 0.50.0
+        - 2
+        version: 0.50.2
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -171,7 +172,7 @@ dependencies:
         version: 0.50.1
   type: :runtime
   version_requirements: *id011
-description: 
+description: ""
 email: roman@railsdog.com
 executables: []
 
@@ -184,20 +185,33 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- app/controllers/admin/base_controller_decorator.rb
+- app/controllers/admin/orders_controller_decorator.rb
 - app/controllers/admin/products_controller_decorator.rb
 - app/controllers/checkout_controller_decorator.rb
+- app/controllers/orders_controller_decorator.rb
 - app/controllers/spree/base_controller_decorator.rb
 - app/controllers/user_sessions_controller_decorator.rb
+- app/helpers/checkout_helper.rb
 - 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/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/checkout/payment/_sberbankinvoice.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/orders/sberbank_invoice.html.erb
+- app/views/orders/show.html.erb
 - app/views/shared/_filters.html.erb
 - app/views/shipment_mailer/shipped_email.text.erb
+- app/views/user_mailer/reset_password_instructions.text.erb
 - config/initializers/secoint.rb
 - config/locales/affiliate_ru.yml
 - config/locales/devise.ru.yml
@@ -205,6 +219,7 @@ files:
 - config/locales/reviews_ru.yml
 - config/locales/robokassa_ru.yml
 - config/locales/ru.yml
+- config/locales/sberbank_ru.yml
 - config/locales/wishlist_ru.yml
 - config/routes.rb
 - db/default/countries.yml
@@ -223,6 +238,7 @@ files:
 - lib/synergy_hooks.rb
 - lib/tasks/install.rake
 - lib/tasks/synergy.rake
+- public/500.html
 - public/images/admin/bg/admin_menu_back.png
 - public/images/admin/bg/admin_sub_menu_back.png
 - public/images/admin/icons/help.png
@@ -231,6 +247,8 @@ files:
 - public/javascripts/admin/jquery.simpletip-1.3.1.pack.js
 - public/stylesheets/admin/inline_help.css
 - public/stylesheets/admin/synergy.css
+- public/stylesheets/courier_instruction.css
+- public/stylesheets/reset.css
 - spec/spec_helper.rb
 - synergy.gemspec
 has_rdoc: true
@@ -253,14 +271,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: 
 - none
-rubyforge_project: 
+rubyforge_project: synergy
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3