rails_marketplace 0.0.2 → 0.0.3

data/app/views/rails_marketplace/seller/settings_tax.html.erb

@@ -1,34 +1,34 @@
-<!-- page content -->
-<div class="right_col" role="main">
-  <div class="">
-    <div class="page-title">
-      <div class="title_left">
-        <h3>Settings / Tax</h3>
-      </div>
-
-    </div>
-    <div class="clearfix"></div>
-
-    <div class="row">
-
-      <div class="col-md-12 col-sm-12 col-xs-12">
-        <div class="x_panel" style="height:600px;">
-          <div class="x_title">
-
-          <%= form_for(:seller, url: seller_settings_tax_update_path) do |f| %>
-            <p id="notice"><%= flash[:error] %></p>
-
-
-
-            <%= f.submit "Submit", class: "btn btn-primary" %>
-          <% end %>
-
-            <div class="clearfix"></div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-<!-- /page content -->
-
+<!-- page content -->
+<div class="right_col" role="main">
+  <div class="">
+    <div class="page-title">
+      <div class="title_left">
+        <h3>Settings / Tax</h3>
+      </div>
+
+    </div>
+    <div class="clearfix"></div>
+
+    <div class="row">
+
+      <div class="col-md-12 col-sm-12 col-xs-12">
+        <div class="x_panel" style="height:600px;">
+          <div class="x_title">
+
+          <%= form_for(:seller, url: seller_settings_tax_update_path) do |f| %>
+            <p id="notice"><%= flash[:error] %></p>
+
+
+
+            <%= f.submit "Submit", class: "btn btn-primary" %>
+          <% end %>
+
+            <div class="clearfix"></div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+<!-- /page content -->
+

data/app/views/rails_marketplace/seller/signup_form.html.erb

@@ -1,28 +1,28 @@
-<% provide(:title, "Sign Up") %>
-<h1>Sign Up</h1>
-
-<div class="row">
-  <div class="col-md-6 col-md-offset-3">
-    <%= form_for(:seller, url: seller_signup_path) do |f| %>
-      <%= render 'rails_marketplace/shared/seller_error_messages' %>
-
-      <%= f.label :first_name %>
-      <%= f.text_field :first_name, class: 'form-control' %>
-
-      <%= f.label :last_name %>
-      <%= f.text_field :last_name, class: 'form-control' %>
-
-      <%= f.label :email %>
-      <%= f.email_field :email, class: 'form-control' %>
-
-      <%= f.label :password %>
-      <%= f.password_field :password, class: 'form-control' %>
-
-      <%= f.label :password_confirmation %>
-      <%= f.password_field :password_confirmation, class: 'form-control' %>
-      
-      <%= f.submit "Submit", class: "btn btn-primary" %>
-    <% end %>
-
-  </div>
+<% provide(:title, "Sign Up") %>
+<h1>Sign Up</h1>
+
+<div class="row">
+  <div class="col-md-6 col-md-offset-3">
+    <%= form_for(:seller, url: seller_signup_path) do |f| %>
+      <%= render 'rails_marketplace/shared/seller_error_messages' %>
+
+      <%= f.label :first_name %>
+      <%= f.text_field :first_name, class: 'form-control' %>
+
+      <%= f.label :last_name %>
+      <%= f.text_field :last_name, class: 'form-control' %>
+
+      <%= f.label :email %>
+      <%= f.email_field :email, class: 'form-control' %>
+
+      <%= f.label :password %>
+      <%= f.password_field :password, class: 'form-control' %>
+
+      <%= f.label :password_confirmation %>
+      <%= f.password_field :password_confirmation, class: 'form-control' %>
+      
+      <%= f.submit "Submit", class: "btn btn-primary" %>
+    <% end %>
+
+  </div>
 </div>

data/app/views/rails_marketplace/seller/step_two.html.erb

@@ -1,17 +1,17 @@
-<%= @title %>
-
-<% provide(:title, "Upload product") %>
-<h1>Choose a category</h1>
-
-<div class="row">
-  <div class="col-md-6 col-md-offset-3">
-    <%= form_for(:product, url: seller_upload_path) do |f| %>
-
-      <%= f.label :title %>
-      <%= f.text_field :title, class: 'form-control' %>
-
-
-      <%= f.submit "Submit", class: "btn btn-primary" %>
-    <% end %>
-  </div>
+<%= @title %>
+
+<% provide(:title, "Upload product") %>
+<h1>Choose a category</h1>
+
+<div class="row">
+  <div class="col-md-6 col-md-offset-3">
+    <%= form_for(:product, url: seller_upload_path) do |f| %>
+
+      <%= f.label :title %>
+      <%= f.text_field :title, class: 'form-control' %>
+
+
+      <%= f.submit "Submit", class: "btn btn-primary" %>
+    <% end %>
+  </div>
 </div>

data/app/views/rails_marketplace/shared/_admin_error_messages.html.erb

@@ -1,12 +1,12 @@
-<% if @admin.errors.any? %>
-  <div id="error_explanation">
-    <div class="alert alert-danger">
-      The form contains <%= pluralize(@admin.errors.count, "error") %>.
-    </div>
-    <ul>
-    <% @admin.errors.full_messages.each do |msg| %>
-      <li><%= msg %></li>
-    <% end %>
-    </ul>
-  </div>
+<% if @admin.errors.any? %>
+  <div id="error_explanation">
+    <div class="alert alert-danger">
+      The form contains <%= pluralize(@admin.errors.count, "error") %>.
+    </div>
+    <ul>
+    <% @admin.errors.full_messages.each do |msg| %>
+      <li><%= msg %></li>
+    <% end %>
+    </ul>
+  </div>
 <% end %>

data/app/views/rails_marketplace/shared/_product_error_messages.html.erb

@@ -1,12 +1,12 @@
-<% if @product.errors.any? %>
-  <div id="error_explanation">
-    <div class="alert alert-danger">
-      The form contains <%= pluralize(@product.errors.count, "error") %>.
-    </div>
-    <ul>
-    <% @product.errors.full_messages.each do |msg| %>
-      <li><%= msg %></li>
-    <% end %>
-    </ul>
-  </div>
+<% if @product.errors.any? %>
+  <div id="error_explanation">
+    <div class="alert alert-danger">
+      The form contains <%= pluralize(@product.errors.count, "error") %>.
+    </div>
+    <ul>
+    <% @product.errors.full_messages.each do |msg| %>
+      <li><%= msg %></li>
+    <% end %>
+    </ul>
+  </div>
 <% end %>

data/app/views/rails_marketplace/shared/_seller_error_messages.html.erb

@@ -1,12 +1,12 @@
-<% if @seller.errors.any? %>
-  <div id="error_explanation">
-    <div class="alert alert-danger">
-      The form contains <%= pluralize(@seller.errors.count, "error") %>.
-    </div>
-    <ul>
-    <% @seller.errors.full_messages.each do |msg| %>
-      <li><%= msg %></li>
-    <% end %>
-    </ul>
-  </div>
+<% if @seller.errors.any? %>
+  <div id="error_explanation">
+    <div class="alert alert-danger">
+      The form contains <%= pluralize(@seller.errors.count, "error") %>.
+    </div>
+    <ul>
+    <% @seller.errors.full_messages.each do |msg| %>
+      <li><%= msg %></li>
+    <% end %>
+    </ul>
+  </div>
 <% end %>

data/config/routes.rb

@@ -1,58 +1,58 @@
-RailsMarketplace::Engine.routes.draw do
-  root 'catalog#index'
-
-  get 'sellercentral' => 'seller#login_form', as: :seller_login
-  post 'sellercentral' => 'seller#login'
-  get 'sellercentral/signup' => 'seller#signup_form', as: :seller_signup
-  post 'sellercentral/signup' => 'seller#signup'
-  get 'sellercentral/logout' => 'seller#logout', as: :seller_logout
-  get 'sellercentral/dashboard' => 'seller#dashboard', as: :seller_dashboard
-  get 'sellercentral/products' => 'seller#products', as: :seller_products
-  get 'sellercentral/products/new' => 'seller#add_product', as: :seller_add_product
-  post 'sellercentral/products/new' => 'seller#create_product', as: :seller_create_product
-  get 'sellercentral/products/:id' => 'seller#edit_product', as: :seller_edit_product
-  post 'sellercentral/products/:id' => 'seller#update_product', as: :seller_update_product
-  delete 'sellercentral/products/:id' => 'seller#delete_product', as: :seller_delete_product
-  get 'sellercentral/add_bulk_products' => 'seller#add_bulk_products', as: :seller_add_bulk_products
-  get 'sellercentral/orders' => 'seller#orders', as: :seller_orders
-  get 'sellercentral/orders/:order_id' => 'seller#order_details', as: :seller_order_details
-  get 'sellercentral/settings/general' => 'seller#settings_general', as: :seller_settings_general
-  post 'sellercentral/settings/general' => 'seller#settings_general_update', as: :seller_settings_general_update
-  get 'sellercentral/settings/shipping' => 'seller#settings_shipping', as: :seller_settings_shipping
-  post 'sellercentral/settings/shipping' => 'seller#settings_shipping_update', as: :seller_settings_shipping_update
-  get 'sellercentral/settings/payment' => 'seller#settings_payment', as: :seller_settings_payment
-  post 'sellercentral/settings/payment' => 'seller#settings_payment_update', as: :seller_settings_payment_update
-  get 'sellercentral/settings/tax' => 'seller#settings_tax', as: :seller_settings_tax
-  
-
-  get 'admin' => 'admin#login_form', as: :admin_login
-  post 'admin' => 'admin#login'
-  get 'admin/signup' => 'admin#signup_form', as: :admin_signup
-  post 'admin/signup' => 'admin#signup'
-  get 'admin/logout' => 'admin#logout', as: :admin_logout
-  get 'admin/dashboard' => 'admin#dashboard', as: :admin_dashboard
-  get 'admin/sellers' => 'admin#sellers', as: :admin_sellers
-  get 'admin/seller/:id/products' => 'admin#seller_products', as: :admin_seller_products  
-  get 'admin/categories' => 'admin#categories', as: :admin_categories
-  get 'admin/add_category' => 'admin#add_category', as: :admin_add_category
-  post 'admin/create_category' => 'admin#create_category', as: :admin_create_category
-  get 'admin/edit_category' => 'admin#edit_category', as: :admin_edit_category
-  post 'admin/update_category' => 'admin#update_category', as: :admin_update_category
-  get 'admin/products' => 'admin#products', as: :admin_products
-  get 'admin/category/:id/products' => 'admin#category_products', as: :admin_category_products
-  get 'admin/settings_form' => 'admin#settings_form', as: :admin_settings_form
-  post 'admin/settings' => 'admin#settings', as: :admin_settings
-
-
-  get 'catalog/:name' => 'catalog#category_products', as: :category_products
-  get 'product/:title' => 'catalog#product_detail', as: :product_detail
-  post 'cart/add' => 'catalog#add_to_cart', as: :add_to_cart
-  post 'purchase' => 'catalog#purchase', as: :purchase
-  get 'cart' => 'catalog#cart', as: :cart
-  put 'cart/update' => 'catalog#cart_update', as: :cart_update
-  get 'cart/delete/:product_id' => 'catalog#cart_delete', as: :cart_delete
-  get 'checkout' => 'catalog#checkout', as: :checkout
-  post 'charge' => 'catalog#charge', as: :charge
-  get 'checkout/success' => 'catalog#checkout_success', as: :checkout_success
-
-end
+RailsMarketplace::Engine.routes.draw do
+  root 'catalog#index'
+
+  get 'sellercentral' => 'seller#login_form', as: :seller_login
+  post 'sellercentral' => 'seller#login'
+  get 'sellercentral/signup' => 'seller#signup_form', as: :seller_signup
+  post 'sellercentral/signup' => 'seller#signup'
+  get 'sellercentral/logout' => 'seller#logout', as: :seller_logout
+  get 'sellercentral/dashboard' => 'seller#dashboard', as: :seller_dashboard
+  get 'sellercentral/products' => 'seller#products', as: :seller_products
+  get 'sellercentral/products/new' => 'seller#add_product', as: :seller_add_product
+  post 'sellercentral/products/new' => 'seller#create_product', as: :seller_create_product
+  get 'sellercentral/products/:id' => 'seller#edit_product', as: :seller_edit_product
+  post 'sellercentral/products/:id' => 'seller#update_product', as: :seller_update_product
+  delete 'sellercentral/products/:id' => 'seller#delete_product', as: :seller_delete_product
+  get 'sellercentral/add_bulk_products' => 'seller#add_bulk_products', as: :seller_add_bulk_products
+  get 'sellercentral/orders' => 'seller#orders', as: :seller_orders
+  get 'sellercentral/orders/:order_id' => 'seller#order_details', as: :seller_order_details
+  get 'sellercentral/settings/general' => 'seller#settings_general', as: :seller_settings_general
+  post 'sellercentral/settings/general' => 'seller#settings_general_update', as: :seller_settings_general_update
+  get 'sellercentral/settings/shipping' => 'seller#settings_shipping', as: :seller_settings_shipping
+  post 'sellercentral/settings/shipping' => 'seller#settings_shipping_update', as: :seller_settings_shipping_update
+  get 'sellercentral/settings/payment' => 'seller#settings_payment', as: :seller_settings_payment
+  post 'sellercentral/settings/payment' => 'seller#settings_payment_update', as: :seller_settings_payment_update
+  get 'sellercentral/settings/tax' => 'seller#settings_tax', as: :seller_settings_tax
+  
+
+  get 'admin' => 'admin#login_form', as: :admin_login
+  post 'admin' => 'admin#login'
+  get 'admin/signup' => 'admin#signup_form', as: :admin_signup
+  post 'admin/signup' => 'admin#signup'
+  get 'admin/logout' => 'admin#logout', as: :admin_logout
+  get 'admin/dashboard' => 'admin#dashboard', as: :admin_dashboard
+  get 'admin/sellers' => 'admin#sellers', as: :admin_sellers
+  get 'admin/seller/:id/products' => 'admin#seller_products', as: :admin_seller_products  
+  get 'admin/categories' => 'admin#categories', as: :admin_categories
+  get 'admin/add_category' => 'admin#add_category', as: :admin_add_category
+  post 'admin/create_category' => 'admin#create_category', as: :admin_create_category
+  get 'admin/edit_category' => 'admin#edit_category', as: :admin_edit_category
+  post 'admin/update_category' => 'admin#update_category', as: :admin_update_category
+  get 'admin/products' => 'admin#products', as: :admin_products
+  get 'admin/category/:id/products' => 'admin#category_products', as: :admin_category_products
+  get 'admin/settings_form' => 'admin#settings_form', as: :admin_settings_form
+  post 'admin/settings' => 'admin#settings', as: :admin_settings
+
+
+  get 'catalog/:name' => 'catalog#category_products', as: :category_products
+  get 'product/:title' => 'catalog#product_detail', as: :product_detail
+  post 'cart/add' => 'catalog#add_to_cart', as: :add_to_cart
+  post 'purchase' => 'catalog#purchase', as: :purchase
+  get 'cart' => 'catalog#cart', as: :cart
+  put 'cart/update' => 'catalog#cart_update', as: :cart_update
+  get 'cart/delete/:product_id' => 'catalog#cart_delete', as: :cart_delete
+  get 'checkout' => 'catalog#checkout', as: :checkout
+  post 'charge' => 'catalog#charge', as: :charge
+  get 'checkout/success' => 'catalog#checkout_success', as: :checkout_success
+
+end

data/db/migrate/20161013194852_create_sellers.rb

@@ -1,13 +1,13 @@
-class CreateSellers < ActiveRecord::Migration[6.0]
-  def change
-    create_table :rails_marketplace_sellers do |t|
-    	t.string :email
-    	t.string :password
-        t.string :password_digest
-    	t.string :first_name
-    	t.string :last_name
-
-    	t.timestamps null: false
-    end
-  end
-end
+class CreateSellers < ActiveRecord::Migration[6.0]
+  def change
+    create_table :rails_marketplace_sellers do |t|
+    	t.string :email
+    	t.string :password
+        t.string :password_digest
+    	t.string :first_name
+    	t.string :last_name
+
+    	t.timestamps null: false
+    end
+  end
+end

data/db/migrate/20161013195006_create_customers.rb

@@ -1,13 +1,13 @@
-class CreateCustomers < ActiveRecord::Migration[6.0]
-  def change
-    create_table :rails_marketplace_customers do |t|
-    	t.string :email
-    	t.string :password
-    	t.string :phone_number
-    	t.string :first_name
-    	t.string :last_name
-
-    	t.timestamps null: false
-    end
-  end
-end
+class CreateCustomers < ActiveRecord::Migration[6.0]
+  def change
+    create_table :rails_marketplace_customers do |t|
+    	t.string :email
+    	t.string :password
+    	t.string :phone_number
+    	t.string :first_name
+    	t.string :last_name
+
+    	t.timestamps null: false
+    end
+  end
+end

data/db/migrate/20161013195758_create_orders.rb

@@ -1,8 +1,8 @@
-class CreateOrders < ActiveRecord::Migration[6.0]
-  def change
-    create_table :rails_marketplace_orders do |t|
-
-      t.timestamps null: false
-    end
-  end
-end
+class CreateOrders < ActiveRecord::Migration[6.0]
+  def change
+    create_table :rails_marketplace_orders do |t|
+
+      t.timestamps null: false
+    end
+  end
+end

data/db/migrate/20161014013032_create_category_products.rb

@@ -1,10 +1,10 @@
-class CreateCategoryProducts < ActiveRecord::Migration[6.0]
-  def change
-    create_table :rails_marketplace_category_products do |t|
-      t.belongs_to :product, :index => true
-      t.belongs_to :category, :index => true
-      	
-      t.timestamps null: false
-    end
-  end
-end
+class CreateCategoryProducts < ActiveRecord::Migration[6.0]
+  def change
+    create_table :rails_marketplace_category_products do |t|
+      t.belongs_to :product, :index => true
+      t.belongs_to :category, :index => true
+      	
+      t.timestamps null: false
+    end
+  end
+end

data/db/migrate/20161014013058_create_order_products.rb

@@ -1,13 +1,13 @@
-class CreateOrderProducts < ActiveRecord::Migration[6.0]
-  def change
-    create_table :rails_marketplace_order_products do |t|
-    	t.belongs_to :product, :index => true
-      	t.belongs_to :order, :index => true
-        t.belongs_to :seller, :index => true
-      	t.integer :quantity
-      	t.string :price
-
-      t.timestamps null: false
-    end
-  end
-end
+class CreateOrderProducts < ActiveRecord::Migration[6.0]
+  def change
+    create_table :rails_marketplace_order_products do |t|
+    	t.belongs_to :product, :index => true
+      	t.belongs_to :order, :index => true
+        t.belongs_to :seller, :index => true
+      	t.integer :quantity
+      	t.string :price
+
+      t.timestamps null: false
+    end
+  end
+end