shoppe 0.0.12 → 0.0.13

data/app/assets/stylesheets/shoppe/application.scss

@@ -182,14 +182,6 @@ header.main {
 				dt label { font-weight:500;}
 				dd {  }
 				dd input[type=text], dd input[type=password], textarea {
-					width:100%; padding:5px; border:1px solid #ccc;
-					-webkit-box-sizing: border-box; /* Safari/Chrome, other WebKit */
-			    -moz-box-sizing: border-box;    /* Firefox, other Gecko */
-			    box-sizing: border-box;         /* Opera/IE 8+ */
-					font-size:1.1em;
-					font-family:$font;
-					&:focus { border-color:#9AC835; }
-					&.short { width:100px;}
 				}
 				dd select { width:100%;}
 				dd textarea { height:80px;	}
@@ -292,16 +284,20 @@ header.main {
 				p.acceptreject { text-align:center; margin-top:22px; }
 				p.acceptreject a { margin: 0 5px;}
 				p.ship { text-align:center; margin-top:22px;}
-				p.ship input[type=text] { padding:5px; width:200px;  }
+				p.ship input[type=text] {  }
 			}
 			
 			dl {
 				dt { float:left; width:30%; text-align:right; color:#888;white-space:nowrap}
 				dd { font-weight:bold; margin-left:35%; margin-bottom:6px; white-space:nowrap}
+				dt.padding { padding-top:6px;}
 			}
 			
-			p.ship { background:#fff; text-align:center;padding:15px;border:1px solid #CED2D8;}
-			p.ship input, p.ship a { margin:0 10px;}
+			dl.form {
+				margin-top:15px;
+				input.text { width:70%}
+				a.button { margin-right:5px;}
+			}
 			
 		}
 		
@@ -326,6 +322,15 @@ header.main {
 			}
 		}
 		
+		.notes {
+			background:#fff;
+			border:1px solid #CED2D8;
+			p { padding:15px;}
+			p textarea { border:0; padding:0; width:100%; resize:none; height:100px; font-family:$font; font-size:1.1em}
+			h4 { background:#F7F9FC; padding:10px 15px; font-weight:500;}
+			h4 input { float:right; margin-top:-3px;}
+		}
+		
 		.order_items {
 			margin:25px 0;
 			table.data {
@@ -407,4 +412,18 @@ span.boolean span.false { color:#c04a4a}
 
 .float-right { float:right;}
 
-div.field_with_errors { display:inline;}
+div.field_with_errors { display:inline;}
+
+//
+// standard text input box
+//
+input.text, textarea.text {
+	width:100%; padding:5px; border:1px solid #ccc;
+	-webkit-box-sizing: border-box; /* Safari/Chrome, other WebKit */
+  -moz-box-sizing: border-box;    /* Firefox, other Gecko */
+  box-sizing: border-box;         /* Opera/IE 8+ */
+	font-size:1.1em;
+	font-family:$font;
+	&:focus { border-color:#9AC835; }
+	&.short { width:100px;}
+}

data/app/assets/stylesheets/shoppe/chosen.css

@@ -19,7 +19,7 @@
   -moz-box-sizing: border-box;
   box-sizing: border-box;
   width: 100%;
-  border: 1px solid #ccc;
+  border: 1px solid #aaa;
   border-top: 0;
   background: #fff;
   box-shadow: 0 4px 5px rgba(0, 0, 0, 0.15);
@@ -39,7 +39,7 @@
   overflow: hidden;
   padding: 0 0 0 8px;
   height: 23px;
-  border: 1px solid #ccc;
+  border: 1px solid #aaa;
   border-radius: 5px;
   background-color: #fff;
   background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #ffffff), color-stop(50%, #f6f6f6), color-stop(52%, #eeeeee), color-stop(100%, #f4f4f4));

data/app/controllers/shoppe/delivery_service_prices_controller.rb

@@ -1,5 +1,6 @@
 class Shoppe::DeliveryServicePricesController < Shoppe::ApplicationController
-  
+
+  before_filter { @active_nav = :delivery_services }
   before_filter { @delivery_service = Shoppe::DeliveryService.find(params[:delivery_service_id])}
   before_filter { params[:id] && @delivery_service_price = @delivery_service.delivery_service_prices.find(params[:id])}
   

data/app/controllers/shoppe/orders_controller.rb

@@ -8,6 +8,11 @@ class Shoppe::OrdersController < Shoppe::ApplicationController
     @orders = @query.result
   end
   
+  def update
+    @order.update_attributes!(params[:order].permit(:notes))
+    redirect_to @order, :notice => "Order has been saved successfully"
+  end
+  
   def search
     index
     render :action => "index"
@@ -29,7 +34,7 @@ class Shoppe::OrdersController < Shoppe::ApplicationController
   end
   
   def pay
-    @order.pay!(params[:payment_reference], 'Manual')
+    @order.pay!(params[:payment_reference], params[:payment_method].blank? ? 'Unknown' : params[:payment_method])
     redirect_to @order, :notice => "Order has been marked as paid successfully"
   end
   

data/app/views/shoppe/delivery_service_prices/_form.html.haml

@@ -4,23 +4,23 @@
     .splitContainer
       %dl.third
         %dt= f.label :code
-        %dd= f.text_field :code
+        %dd= f.text_field :code, :class => 'text'
       
       %dl.third
         %dt= f.label :min_weight
-        %dd= f.text_field :min_weight
+        %dd= f.text_field :min_weight, :class => 'text'
       %dl.third
         %dt= f.label :max_weight
-        %dd= f.text_field :max_weight
+        %dd= f.text_field :max_weight, :class => 'text'
 
   = field_set_tag "Pricing" do
     .splitContainer
       %dl.third
         %dt= f.label :price
-        %dd= f.text_field :price
+        %dd= f.text_field :price, :class => 'text'
       %dl.third
         %dt= f.label :cost_price
-        %dd= f.text_field :cost_price
+        %dd= f.text_field :cost_price, :class => 'text'
       %dl.third
         %dt= f.label :tax_rate_id
         %dd= f.collection_select :tax_rate_id, Shoppe::TaxRate.ordered, :id, :description, {:include_blank => true}, {:class => 'chosen-with-deselect', :data => {:placeholder => "No tax"}}

data/app/views/shoppe/delivery_services/_form.html.haml

@@ -4,10 +4,10 @@
     .splitContainer
       %dl.half
         %dt= f.label :name
-        %dd= f.text_field :name
+        %dd= f.text_field :name, :class => 'text'
       %dl.half
         %dt= f.label :code
-        %dd= f.text_field :code
+        %dd= f.text_field :code, :class => 'text'
     .splitContainer
       %dl.half
         %dt= f.label :active
@@ -23,11 +23,11 @@
     .splitContainer
       %dl.half
         %dt= f.label :courier, "Courier Name"
-        %dd= f.text_field :courier
+        %dd= f.text_field :courier, :class => 'text'
       %dl.half
         %dt= f.label :tracking_url, "Tracking URL"
         %dd
-          = f.text_field :tracking_url
+          = f.text_field :tracking_url, :class => 'text'
           %p.help Use <code>{{consignment_number}}</code> to insert the consignment number.
 
   %p.submit

data/app/views/shoppe/orders/show.html.haml

@@ -33,20 +33,28 @@
       
       - if !@order.paid?
         = form_tag [:pay, @order] do
-          %p.ship
-            = text_field_tag 'payment_reference', '', :placeholder => "Enter payment reference..."
-            = submit_tag "Mark as paid", :class => 'button green'
+          %dl.form
+            %dt.padding= label_tag 'payment_method', 'Payment Method'
+            %dd= text_field_tag 'payment_method', '', :class => 'text'
+          %dl
+            %dt.padding= label_tag 'payment_reference', 'Payment Reference'
+            %dd= text_field_tag 'payment_reference', '', :class => 'text'
+          %dl
+            %dd= submit_tag "Mark as paid", :class => 'button green button-mini'
       
       - if @order.accepted? && !@order.shipped?
         = form_tag [:ship, @order] do
-          %p.ship
-            = text_field_tag 'consignment_number', '', :placeholder => "Enter consignment number..."
-            = submit_tag "Ship", :class => 'button green'
+          %dl.form
+            %dt.padding= label_tag 'consignment_number', 'Consignment Number'
+            %dd= text_field_tag 'consignment_number', '', :class => 'text'
+          %dl
+            %dd= submit_tag "Mark as shipped", :class => 'button green button-mini'
       
       - if @order.paid? && !(@order.accepted? || @order.rejected?)
-        %p.ship
-          = link_to 'Accept order', [:accept, @order], :method => :post, :class => 'button green'
-          = link_to "Reject order", [:reject, @order], :method => :post, :class => 'button purple'
+        %dl.form
+          %dd
+            = link_to "Accept", [:accept, @order], :method => :post, :class => 'button green'
+            = link_to "Reject", [:reject, @order], :method => :post, :class => 'button purple'
   
   .status-bar
     %ul
@@ -79,7 +87,7 @@
             %p= link_to "Tracking URL", @order.courier_tracking_url
           - else
             %p Consignment # <b>#{@order.consignment_number}</b>
- 
+  
   .order_items
     .table
       %table.data
@@ -118,3 +126,10 @@
             %td.money= number_to_currency @order.total_before_tax
             %td.money= number_to_currency @order.tax
             %td.money= number_to_currency @order.total
+  .notes
+    = form_for @order do |f|
+      %h4
+        = f.submit "Save Notes", :class => 'button button-mini green'
+        Order Notes
+      %p= f.text_area :notes
+

data/app/views/shoppe/product_categories/_form.html.haml

@@ -4,13 +4,13 @@
     .splitContainer
       %dl.half
         %dt= f.label :name
-        %dd= f.text_field :name
+        %dd= f.text_field :name, :class => 'text'
       %dl.half
         %dt= f.label :permalink
-        %dd= f.text_field :permalink
+        %dd= f.text_field :permalink, :class => 'text'
     %dl
       %dt= f.label :description
-      %dd= f.text_area :description
+      %dd= f.text_area :description, :class => 'text'
   = field_set_tag "Attachments" do
 
     %dl

data/app/views/shoppe/products/_form.html.haml

@@ -8,22 +8,22 @@
     .splitContainer
       %dl.third
         %dt= f.label :title
-        %dd= f.text_field :title
+        %dd= f.text_field :title, :class => 'text'
       %dl.third
         %dt= f.label :permalink
-        %dd= f.text_field :permalink
+        %dd= f.text_field :permalink, :class => 'text'
       %dl.third
         %dt= f.label :sku, 'SKU'
-        %dd= f.text_field :sku
+        %dd= f.text_field :sku, :class => 'text'
     %dl
       %dt= f.label :description
-      %dd= f.text_area :description
+      %dd= f.text_area :description, :class => 'text'
     %dl
       %dt= f.label :short_description
-      %dd= f.text_area :short_description
+      %dd= f.text_area :short_description, :class => 'text'
     %dl
       %dt= f.label :in_the_box, "What's in the box?"
-      %dd= f.text_area :in_the_box
+      %dd= f.text_area :in_the_box, :class => 'text'
   
   = field_set_tag "Attributes" do
     .margin
@@ -71,10 +71,10 @@
     .splitContainer
       %dl.third
         %dt= f.label :price
-        %dd= f.text_field :price
+        %dd= f.text_field :price, :class => 'text'
       %dl.third
         %dt= f.label :cost_price
-        %dd= f.text_field :cost_price
+        %dd= f.text_field :cost_price, :class => 'text'
       %dl.third
         %dt= f.label :tax_rate_id
         %dd= f.collection_select :tax_rate_id, Shoppe::TaxRate.ordered, :id, :description, {:include_blank => true}, {:class => 'chosen-with-deselect', :data => {:placeholder => "No tax"}}
@@ -97,7 +97,7 @@
     .splitContainer
       %dl.half
         %dt= f.label :weight
-        %dd= f.text_field :weight
+        %dd= f.text_field :weight, :class => 'text'
       
       %dl.half
         %dt= f.label :stock_control

data/app/views/shoppe/tax_rates/form.html.haml

@@ -9,10 +9,10 @@
     .splitContainer
       %dl.half
         %dt= f.label :name
-        %dd= f.text_field :name, :class => 'focus'
+        %dd= f.text_field :name, :class => 'focus text'
       %dl.half
         %dt= f.label :rate
-        %dd= f.text_field :rate
+        %dd= f.text_field :rate, :class => 'text'
   
   = field_set_tag "Countries" do
     %dl

data/db/migrate/20131021135208_add_notes_to_orders.rb

@@ -0,0 +1,5 @@
+class AddNotesToOrders < ActiveRecord::Migration
+  def change
+    add_column :shoppe_orders, :notes, :text
+  end
+end

data/lib/shoppe/engine.rb

@@ -15,6 +15,8 @@ module Shoppe
       g.helper          false
     end
     
+    config.assets.precompile += ['shoppe/sub.css']
+    
     initializer 'shoppe.initialize' do |app|
       # Preload the config
       Shoppe.config

data/lib/shoppe/version.rb

@@ -1,3 +1,3 @@
 module Shoppe
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20131020204719) do
+ActiveRecord::Schema.define(version: 20131021135208) do
 
   create_table "nifty_attachments", force: true do |t|
     t.integer  "parent_id"
@@ -114,6 +114,7 @@ ActiveRecord::Schema.define(version: 20131020204719) do
     t.string   "payment_reference"
     t.string   "payment_method"
     t.decimal  "delivery_cost_price", precision: 8, scale: 2
+    t.text     "notes"
   end
 
   create_table "shoppe_product_attributes", force: true do |t|

data/test/dummy/log/development.log

@@ -1078,3 +1078,10 @@ Migrating to AddCountriesToTaxRatesAndDeliveryPrices (20131020204719)
   SQL (0.2ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20131020204719')
    (0.3ms)  COMMIT
   ActiveRecord::SchemaMigration Load (0.2ms)  SELECT `schema_migrations`.* FROM `schema_migrations`
+  ActiveRecord::SchemaMigration Load (1.0ms)  SELECT `schema_migrations`.* FROM `schema_migrations`
+Migrating to AddNotesToOrders (20131021135208)
+   (25.9ms)  ALTER TABLE `shoppe_orders` ADD `notes` text
+   (0.1ms)  BEGIN
+  SQL (1.7ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20131021135208')
+   (0.4ms)  COMMIT
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT `schema_migrations`.* FROM `schema_migrations`

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shoppe
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -379,6 +379,7 @@ files:
 - db/migrate/20131017180920_create_shoppe_countries.rb
 - db/migrate/20131017183211_create_shoppe_tax_rates.rb
 - db/migrate/20131020204719_add_countries_to_tax_rates_and_delivery_prices.rb
+- db/migrate/20131021135208_add_notes_to_orders.rb
 - db/seeds.rb
 - db/seeds_data/poe400.jpg
 - db/seeds_data/snom-870-blk.jpg
@@ -464,7 +465,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2288796444690138098
+      hash: -782620393111766145
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -473,7 +474,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2288796444690138098
+      hash: -782620393111766145
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23