mechanize_store 0.0.3 → 0.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjEzYzRiNjFiMzY5N2QzN2EzNGNlMDZmZmJiYTRiOTMyNjM1NTliNg==
+    ODczNDdiMmIwZGU3MTAyNGIwODNkZmE3MjI3NDgwMjQ1ZjEyOWQ5MA==
   data.tar.gz: !binary |-
-    YjM5MmNhNmFhMjMwNmI2M2NkYTMwYmU3YjdhZTI2MTM3NTljYzlkMA==
+    YjNlYzc5MDhlZDc5ZGRkYmY0OTY2MDRmMDFiMWVmM2E3MDhiOTA5Mw==
 SHA512:
   metadata.gz: !binary |-
-    MDcyYjdmYzNhODk5YjliYjIxY2MxMTZiNjgzOGNlZmY3MmJjODNlYWQzMjJh
-    MDc1MTQwNmUwYWFiYWQyYWY5OTYzYjdiYjA4NWUwYWZiZDNkMjQwM2M5OWM1
-    OWMyZGIzZTljNmZmNjYwYzlhYjJjNGU3Y2NkZjhjNTdkODhkYzY=
+    YjgxODE4ZmE5M2FmZDdlM2IxMzZhZjRlMmQ0MjhmZGM1MDE0NWNiZGU5NTVj
+    YWY0YjJkMzBjMGI1MzJlNzRiOWM4OWM4NjQyOThlMjg0MDIxODIxY2E4ZmE1
+    YjczOTZmM2ZlNjQ5MDU5NjY2YWQ4MjI3NjEwOTBlNTFjYjAxNmU=
   data.tar.gz: !binary |-
-    ZDJhOTEzY2RlZTc2ZjRjMGJkMWJkMmQ4OWUyNTAxODk3ZDAzMWZiZjdmODk4
-    NmQ2NjMxOWZjMWY5ODE4YmUyZjEyNjdjYjg5OTM3ZGM5N2Y5ZGJhYmMzYmNh
-    OWVhNzQxMmMwZDk3MWRhZmM3NTU5N2YxZjhmNDk3MTJkMDQzMjE=
+    YmU3MzBhNWM4YzUxYzc5YWEzOGZjMzBmNTI2ZjAxZTg1NTM1NzVkMzRlODQy
+    OWI3ZmM5NjM1NTQwNTBjMTk3YTk5NTFlMGEwN2QzYTlkNTM0ZTNkNzFmZjBi
+    ZjZmZGM5YzhjZGVhYmU3NjY5OTJhYzA3YzBiYjJhOTVkMmRiMjE=

data/app/controllers/mechanize_store/orders_controller.rb

@@ -15,6 +15,7 @@ module MechanizeStore
             params[:q] ||= {}
 
             @search = Order.search(params[:q])
+            
             @orders = @search.result.paginate(page: params[:page])
 
             respond_with @orders

data/app/models/mechanize_store/freight.rb

@@ -1,5 +1,7 @@
 module MechanizeStore
   class Freight < ActiveRecord::Base
     belongs_to :order
+
+    validates :service, :value, :zipcode, :delivery_time, presence: true
   end
 end

data/app/models/mechanize_store/payment.rb

@@ -4,5 +4,7 @@ module MechanizeStore
         belongs_to :payment_status
         belongs_to :payment_type
         belongs_to :flag
+
+        validates_presence_of :payment_type_id
     end
 end

data/config/locales/mechanize_store.pt-BR.yml

@@ -35,6 +35,7 @@ pt-BR:
             mechanize_store/order_status:
                 name: Nome
             mechanize_store/payment:
+                payment_type_id: "Tipo de pagamento"
                 payment_status_id: "Status do pagamento"
             mechanize_store/payment_status:
                 name: "Nome"
@@ -59,7 +60,9 @@ pt-BR:
                 flag: "Bandeira"
                 order: "Compra"
                 order_status: "Status de compra"
+                payment: "Pagamento"
                 payment_status: "Status de pagamento"
+                payment/payment_type: "Tipo de pagamento"
                 payment_type: "Tipo de pagamento"
                 product: "Produtos"
                 product_category: "Categoria de produto"

data/lib/mechanize_store/version.rb

@@ -1,3 +1,3 @@
 module MechanizeStore
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/controllers/mechanize_store/orders_controller_spec.rb

@@ -5,8 +5,10 @@ module MechanizeStore
     routes { MechanizeStore::Engine.routes }
 
     before do
-        @payment = FactoryGirl.create(:mechanize_store_payment)
-        @order = FactoryGirl.create(:mechanize_store_order, payment: @payment)
+      @payment_type = FactoryGirl.create(:mechanize_store_payment_type)
+      @payment = FactoryGirl.create(:mechanize_store_payment, payment_type: @payment_type)
+      @order_status = FactoryGirl.create(:mechanize_store_order_status)
+      @order = FactoryGirl.create(:mechanize_store_order, payment: @payment, order_status: @order_status)
     end
 
     let(:valid_session) { {} }
@@ -14,6 +16,7 @@ module MechanizeStore
     describe "GET index" do
       it "assigns all order_statuses as @order_statuses" do
         get :index, {}, valid_session
+
         assigns(:orders).should eq([@order])
       end
     end

data/spec/dummy/db/migrate/{20140407144123_create_mechanize_store_payments.mechanize_store.rb → 20140424193639_create_mechanize_store_payments.mechanize_store.rb}

@@ -2,8 +2,7 @@
 class CreateMechanizeStorePayments < ActiveRecord::Migration
   def change
     create_table :mechanize_store_payments do |t|
-      t.integer :payable_id
-      t.string :payable_type
+      t.integer :order_id, index: true
       t.references :payment_status, index: true
       t.float :value
       t.float :paid_value

data/spec/dummy/db/migrate/20140424193647_add_payment_type_id_to_payment.mechanize_store.rb

@@ -0,0 +1,7 @@
+# This migration comes from mechanize_store (originally 20140416123100)
+class AddPaymentTypeIdToPayment < ActiveRecord::Migration
+  def change
+    add_column :mechanize_store_payments, :payment_type_id, :integer
+    add_index :mechanize_store_payments, :payment_type_id
+  end
+end

data/spec/dummy/db/migrate/20140424193648_add_time_to_freight.mechanize_store.rb

@@ -0,0 +1,6 @@
+# This migration comes from mechanize_store (originally 20140417200520)
+class AddTimeToFreight < ActiveRecord::Migration
+  def change
+    add_column :mechanize_store_freights, :delivery_time, :integer
+  end
+end

data/spec/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: 20140409191457) do
+ActiveRecord::Schema.define(version: 20140424193648) do
 
   create_table "mechanize_store_flags", force: true do |t|
     t.string   "name"
@@ -26,6 +26,7 @@ ActiveRecord::Schema.define(version: 20140409191457) do
     t.string   "zipcode"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.integer  "delivery_time"
   end
 
   add_index "mechanize_store_freights", ["order_id"], name: "index_mechanize_store_freights_on_order_id"
@@ -72,8 +73,7 @@ ActiveRecord::Schema.define(version: 20140409191457) do
   end
 
   create_table "mechanize_store_payments", force: true do |t|
-    t.integer  "payable_id"
-    t.string   "payable_type"
+    t.integer  "order_id"
     t.integer  "payment_status_id"
     t.float    "value"
     t.float    "paid_value"
@@ -82,10 +82,12 @@ ActiveRecord::Schema.define(version: 20140409191457) do
     t.integer  "flag_id"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.integer  "payment_type_id"
   end
 
   add_index "mechanize_store_payments", ["flag_id"], name: "index_mechanize_store_payments_on_flag_id"
   add_index "mechanize_store_payments", ["payment_status_id"], name: "index_mechanize_store_payments_on_payment_status_id"
+  add_index "mechanize_store_payments", ["payment_type_id"], name: "index_mechanize_store_payments_on_payment_type_id"
 
   create_table "mechanize_store_product_categories", force: true do |t|
     t.string   "name"