rails_marketplace 0.0.2 → 0.0.3

data/app/controllers/rails_marketplace/application_controller.rb

@@ -1,4 +1,4 @@
-module RailsMarketplace
-  class ApplicationController < ActionController::Base
-  end
-end
+module RailsMarketplace
+  class ApplicationController < ActionController::Base
+  end
+end

data/app/controllers/rails_marketplace/catalog_controller.rb

@@ -1,172 +1,172 @@
-require_dependency "rails_marketplace/application_controller"
-
-module RailsMarketplace
-	class CatalogController < ApplicationController
-
-		before_action :set_current_category, :only => [:category_products, :product_detail]
-		before_action :set_current_cart, :only => [:add_to_cart, :purchase, :cart, :cart_update, :cart_delete, :checkout, :charge]
-		after_action :reset_success_orders, :only => [:checkout_success]
-
-		def index
-
-		end
-		
-		def category_products
-			@products = @category.products
-		end
-
-		def product_detail
-			@product = Product.friendly.find(params[:title])
-		end
-
-		def add_to_cart
-			@cart.add_product params[:product_id], params[:quantity]
-			redirect_to cart_path
-		end
-
-		def purchase
-			@cart.add_product params[:product_id], params[:quantity]
-			redirect_to checkout_path
-		end
-
-		def cart
-			@cart_quantity = @cart.cart_quantity
-			@cart_subtotal = @cart.cart_subtotal
-		end
-
-		def cart_update
-			@cart.update_product params[:product_id], params[:quantity]
-		end
-
-		def cart_delete
-			@cart.delete_product params[:product_id]
-			redirect_to cart_path
-		end
-
-		def checkout
-			@total = @cart.cart_subtotal
-			@amount = @cart.cart_subtotal.cents
-			@product_groups = @cart.get_product_groups
-		end
-
-		def charge
-			Stripe.api_key = AdminSetting.stripe_secret_key
-		  	# Amount in cents
-		  	@subtotal = @cart.cart_subtotal.cents
-		  	#@shipping_total = 
-		  	#@tax_total = 
-
-		  	charge_total = @subtotal
-
-			# Get the credit card details submitted by the form
-			token = params[:stripeToken]
-			group_order_id = get_new_group_order_id
-			# Create a charge: this will charge the user's card
-			begin
-			  charge = Stripe::Charge.create(
-			    :amount => charge_total, # Amount in cents
-			    :currency => "usd",
-			    :source => token,
-			    :transfer_group => group_order_id
-			  )
-			rescue Stripe::CardError => e
-			  # The card has been declined
-			  flash[:error] = e.message
-		  	  redirect_to checkout_path
-			end
-
-			order_params = {
-				email: params[:email], 
-				fullname: params[:fullname],
-				address1: params[:address1],
-				address2: params[:address2],
-				city: params[:city],
-				state: params[:state],
-				zip: params[:zip],
-				country: params[:country],
-				phone: params[:phone],
-				is_gift: params[:is_gift],
-				gift_message: params[:gift_message]		
-			}
-			# group products by seller
-			product_groups = @cart.get_product_groups
-			i = 0
-			product_groups.each do |seller_id, cart_products|
-				i += 1
-				order_params[:id] = "#{group_order_id}-#{i}"
-				order_params[:seller_id] = seller_id
-				order_params[:shipping_method] = params[:shipping_method][seller_id.to_s]
-				
-				# transfer to seller account 
-				seller_subtotal = get_seller_subtotal(cart_products).cents
-				# seller_shipping_fee = get_seller_shipping seller_id, params[:shipping_method][seller_id.to_s]
-				seller_total = seller_subtotal
-				
-				# assumming 5% marketplace fee, 2% stripe fee
-				seller_transfer_total = (seller_total * 0.93).to_i
-
-				# Create a Transfer to a connected account (later):
-				transfer = Stripe::Transfer.create({
-				  :amount => seller_transfer_total,
-				  :currency => "usd",
-				  :destination => "#{SellerSetting.find_by_seller_id(seller_id).stripe_account_id}",
-				  :transfer_group => "#{group_order_id}",
-				})
-
-				# save seller's order
-				order = Order.new(order_params)
-				order.save
-				order.save_products cart_products
-				(session[:order_ids] ||= []) << order.id
-
-			end
-			# todo: send email
-			redirect_to checkout_success_path
-		end
-
-		def checkout_success
-			# todo: only show after checkout success
-			if session[:order_ids]
-				@order_ids = session[:order_ids]
-			else
-				redirect_to cart_path
-			end
-			session.delete(:cart_id)
-		end
-
-
-		private
-			def set_current_category
-				if params[:name]
-					session[:current_category_name] = params[:name]
-				end
-				return unless session[:current_category_name]
-				@category ||= Category.friendly.find(session[:current_category_name])
-			end
-
-			def set_current_cart
-		    	@cart ||= Cart.find(session[:cart_id])
-
-		    rescue ActiveRecord::RecordNotFound
-		        @cart = Cart.create
-		        session[:cart_id] = @cart.id
-			end
-			
-			def reset_success_orders
-				session.delete(:order_ids)
-			end
-
-			# todo: generate unique order id
-			def get_new_group_order_id
-				"20170319"
-			end
-
-			def get_seller_subtotal(cart_products)
-				subtotal = 0
-				cart_products.each do |cart_product|
-					subtotal += cart_product.quantity * cart_product.price
-				end
-				subtotal
-			end
-	end
+require_dependency "rails_marketplace/application_controller"
+
+module RailsMarketplace
+	class CatalogController < ApplicationController
+
+		before_action :set_current_category, :only => [:category_products, :product_detail]
+		before_action :set_current_cart, :only => [:add_to_cart, :purchase, :cart, :cart_update, :cart_delete, :checkout, :charge]
+		after_action :reset_success_orders, :only => [:checkout_success]
+
+		def index
+
+		end
+		
+		def category_products
+			@products = @category.products
+		end
+
+		def product_detail
+			@product = Product.friendly.find(params[:title])
+		end
+
+		def add_to_cart
+			@cart.add_product params[:product_id], params[:quantity]
+			redirect_to cart_path
+		end
+
+		def purchase
+			@cart.add_product params[:product_id], params[:quantity]
+			redirect_to checkout_path
+		end
+
+		def cart
+			@cart_quantity = @cart.cart_quantity
+			@cart_subtotal = @cart.cart_subtotal
+		end
+
+		def cart_update
+			@cart.update_product params[:product_id], params[:quantity]
+		end
+
+		def cart_delete
+			@cart.delete_product params[:product_id]
+			redirect_to cart_path
+		end
+
+		def checkout
+			@total = @cart.cart_subtotal
+			@amount = @cart.cart_subtotal.cents
+			@product_groups = @cart.get_product_groups
+		end
+
+		def charge
+			Stripe.api_key = AdminSetting.stripe_secret_key
+		  	# Amount in cents
+		  	@subtotal = @cart.cart_subtotal.cents
+		  	#@shipping_total = 
+		  	#@tax_total = 
+
+		  	charge_total = @subtotal
+
+			# Get the credit card details submitted by the form
+			token = params[:stripeToken]
+			group_order_id = get_new_group_order_id
+			# Create a charge: this will charge the user's card
+			begin
+			  charge = Stripe::Charge.create(
+			    :amount => charge_total, # Amount in cents
+			    :currency => "usd",
+			    :source => token,
+			    :transfer_group => group_order_id
+			  )
+			rescue Stripe::CardError => e
+			  # The card has been declined
+			  flash[:error] = e.message
+		  	  redirect_to checkout_path
+			end
+
+			order_params = {
+				email: params[:email], 
+				fullname: params[:fullname],
+				address1: params[:address1],
+				address2: params[:address2],
+				city: params[:city],
+				state: params[:state],
+				zip: params[:zip],
+				country: params[:country],
+				phone: params[:phone],
+				is_gift: params[:is_gift],
+				gift_message: params[:gift_message]		
+			}
+			# group products by seller
+			product_groups = @cart.get_product_groups
+			i = 0
+			product_groups.each do |seller_id, cart_products|
+				i += 1
+				order_params[:id] = "#{group_order_id}-#{i}"
+				order_params[:seller_id] = seller_id
+				order_params[:shipping_method] = params[:shipping_method][seller_id.to_s]
+				
+				# transfer to seller account 
+				seller_subtotal = get_seller_subtotal(cart_products).cents
+				# seller_shipping_fee = get_seller_shipping seller_id, params[:shipping_method][seller_id.to_s]
+				seller_total = seller_subtotal
+				
+				# assumming 5% marketplace fee, 2% stripe fee
+				seller_transfer_total = (seller_total * 0.93).to_i
+
+				# Create a Transfer to a connected account (later):
+				transfer = Stripe::Transfer.create({
+				  :amount => seller_transfer_total,
+				  :currency => "usd",
+				  :destination => "#{SellerSetting.find_by_seller_id(seller_id).stripe_account_id}",
+				  :transfer_group => "#{group_order_id}",
+				})
+
+				# save seller's order
+				order = Order.new(order_params)
+				order.save
+				order.save_products cart_products
+				(session[:order_ids] ||= []) << order.id
+
+			end
+			# todo: send email
+			redirect_to checkout_success_path
+		end
+
+		def checkout_success
+			# todo: only show after checkout success
+			if session[:order_ids]
+				@order_ids = session[:order_ids]
+			else
+				redirect_to cart_path
+			end
+			session.delete(:cart_id)
+		end
+
+
+		private
+			def set_current_category
+				if params[:name]
+					session[:current_category_name] = params[:name]
+				end
+				return unless session[:current_category_name]
+				@category ||= Category.friendly.find(session[:current_category_name])
+			end
+
+			def set_current_cart
+		    	@cart ||= Cart.find(session[:cart_id])
+
+		    rescue ActiveRecord::RecordNotFound
+		        @cart = Cart.create
+		        session[:cart_id] = @cart.id
+			end
+			
+			def reset_success_orders
+				session.delete(:order_ids)
+			end
+
+			# todo: generate unique order id
+			def get_new_group_order_id
+				"20170319"
+			end
+
+			def get_seller_subtotal(cart_products)
+				subtotal = 0
+				cart_products.each do |cart_product|
+					subtotal += cart_product.quantity * cart_product.price
+				end
+				subtotal
+			end
+	end
 end

data/app/controllers/rails_marketplace/seller_controller.rb

@@ -1,181 +1,181 @@
-require_dependency "rails_marketplace/application_controller"
-
-module RailsMarketplace
-	class SellerController < ApplicationController
-		layout 'rails_marketplace/seller_central'
-		include SellerHelper
-
-		before_action :require_login, :except => [:login_form, :login, :signup_form, :signup]
-		before_action :set_current_seller
-		before_action :set_current_product, :only => [:edit_product, :update_product, :delete_product]
-
-		def login_form
-			if seller_logged_in?
-				redirect_to seller_dashboard_path
-			end
-		end
-
-		def login
-		    seller = Seller.find_by(email: params[:seller][:email].downcase)
-		    if seller && seller.authenticate(params[:seller][:password])
-		      seller_log_in seller
-		      redirect_to seller_dashboard_path
-		    else
-		      flash[:error] = 'Invalid email/password combination'
-		      render 'login_form'
-		    end
-		end
-
-		def signup_form
-			@seller = Seller.new
-		end
-
-		def signup
-			@seller = Seller.new(seller_params)
-			if @seller.save
-				if @seller.seller_setting.nil?
-					SellerSetting.create seller_id: @seller.id
-
-					Stripe.api_key = AdminSetting.stripe_secret_key
-
-					managed_account = Stripe::Account.create(
-					  :managed => true,
-					  :country => 'US',
-					  :email => @seller.email
-					)
-
-					seller_setting = SellerSetting.find_by_seller_id(@seller.id)
-					seller_setting.update_attributes({:stripe_account_id => managed_account.id, :stripe_secret_key => managed_account.keys.secret, :stripe_publishable_key => managed_account.keys.publishable})
-				end
-				seller_log_in @seller
-				redirect_to seller_dashboard_path
-			else
-		      	render 'signup_form'
-		    end
-		end
-
-		def logout
-			seller_log_out
-			redirect_to seller_login_path
-		end
-
-		def dashboard
-
-		end
-
-		def products
-			@products = Product.where(seller: @current_seller)
-		end
-
-		def add_product
-			@product = Product.new
-		end
-
-		def create_product
-			@product = Product.new(product_params)
-			@product.seller = @current_seller
-			if @product.save
-				flash[:notice] = 'New product was successfully added!'
-				redirect_to seller_products_path
-			else
-		      	render 'add_product'
-		    end
-		end
-
-		def edit_product
-
-		end
-
-		def update_product
-			if @product.update_attributes(product_params)
-				flash[:notice] = 'Product was successfully updated!'
-				redirect_to seller_products_path
-			else
-		      	render 'update_product'
-		    end		
-		end
-
-		def delete_product
-			@product.destroy
-			redirect_to seller_products_path
-		end
-
-		def add_bulk_products
-			
-		end
-
-		def orders
-			@orders = Order.where(seller_id: @current_seller.id)
-			# @order_products = OrderProduct.where(seller: @current_seller)
-		end
-
-		def order_details
-			order_id = params[:order_id]
-			@order = Order.find(order_id)
-			if @order.seller_id != @current_seller.id
-				flash[:error] = "The page you’re looking for could not be found. Please make sure the web address is correct."
-				redirect_to seller_orders_path
-			end
-			
-			@order_products = @order.order_products
-		end
-
-		def settings_general
-			
-		end
-
-		def settings_general_update
-			@current_seller.update_attributes(seller_params)
-			redirect_to seller_dashboard_path
-		end
-
-		def settings_shipping
-
-		end
-
-		def settings_shipping_update
-
-		end	
-
-		def settings_payment
-
-		end
-
-		def settings_payment_update
-
-		end	
-
-		def settings_tax
-
-		end
-
-
-		  private
-
-			def seller_params
-			  params.require(:seller).permit(:first_name, :last_name, :email, :password,
-			                               :password_confirmation)
-			end
-
-		  	def set_current_seller
-		    	return unless session[:seller_id]
-		    	@current_seller ||= Seller.find(session[:seller_id])
-		  	end
-
-			def require_login
-			    unless seller_logged_in?
-			      flash[:error] = "You must be logged in to access this section"
-			      redirect_to seller_login_path # halts request cycle
-			    end
-			end
-
-			def product_params
-			    params.require(:product).permit(:title, :description, :price, :quantity, {images: []}, {files: []}, {category_ids: []})
-			end
-
-			def set_current_product
-				return unless params[:id]
-				@product ||= Product.find(params[:id])
-			end
-	end
+require_dependency "rails_marketplace/application_controller"
+
+module RailsMarketplace
+	class SellerController < ApplicationController
+		layout 'rails_marketplace/seller_central'
+		include SellerHelper
+
+		before_action :require_login, :except => [:login_form, :login, :signup_form, :signup]
+		before_action :set_current_seller
+		before_action :set_current_product, :only => [:edit_product, :update_product, :delete_product]
+
+		def login_form
+			if seller_logged_in?
+				redirect_to seller_dashboard_path
+			end
+		end
+
+		def login
+		    seller = Seller.find_by(email: params[:seller][:email].downcase)
+		    if seller && seller.authenticate(params[:seller][:password])
+		      seller_log_in seller
+		      redirect_to seller_dashboard_path
+		    else
+		      flash[:error] = 'Invalid email/password combination'
+		      render 'login_form'
+		    end
+		end
+
+		def signup_form
+			@seller = Seller.new
+		end
+
+		def signup
+			@seller = Seller.new(seller_params)
+			if @seller.save
+				if @seller.seller_setting.nil?
+					SellerSetting.create seller_id: @seller.id
+
+					Stripe.api_key = AdminSetting.stripe_secret_key
+
+					managed_account = Stripe::Account.create(
+					  :managed => true,
+					  :country => 'US',
+					  :email => @seller.email
+					)
+
+					seller_setting = SellerSetting.find_by_seller_id(@seller.id)
+					seller_setting.update_attributes({:stripe_account_id => managed_account.id, :stripe_secret_key => managed_account.keys.secret, :stripe_publishable_key => managed_account.keys.publishable})
+				end
+				seller_log_in @seller
+				redirect_to seller_dashboard_path
+			else
+		      	render 'signup_form'
+		    end
+		end
+
+		def logout
+			seller_log_out
+			redirect_to seller_login_path
+		end
+
+		def dashboard
+
+		end
+
+		def products
+			@products = Product.where(seller: @current_seller)
+		end
+
+		def add_product
+			@product = Product.new
+		end
+
+		def create_product
+			@product = Product.new(product_params)
+			@product.seller = @current_seller
+			if @product.save
+				flash[:notice] = 'New product was successfully added!'
+				redirect_to seller_products_path
+			else
+		      	render 'add_product'
+		    end
+		end
+
+		def edit_product
+
+		end
+
+		def update_product
+			if @product.update_attributes(product_params)
+				flash[:notice] = 'Product was successfully updated!'
+				redirect_to seller_products_path
+			else
+		      	render 'update_product'
+		    end		
+		end
+
+		def delete_product
+			@product.destroy
+			redirect_to seller_products_path
+		end
+
+		def add_bulk_products
+			
+		end
+
+		def orders
+			@orders = Order.where(seller_id: @current_seller.id)
+			# @order_products = OrderProduct.where(seller: @current_seller)
+		end
+
+		def order_details
+			order_id = params[:order_id]
+			@order = Order.find(order_id)
+			if @order.seller_id != @current_seller.id
+				flash[:error] = "The page you’re looking for could not be found. Please make sure the web address is correct."
+				redirect_to seller_orders_path
+			end
+			
+			@order_products = @order.order_products
+		end
+
+		def settings_general
+			
+		end
+
+		def settings_general_update
+			@current_seller.update_attributes(seller_params)
+			redirect_to seller_dashboard_path
+		end
+
+		def settings_shipping
+
+		end
+
+		def settings_shipping_update
+
+		end	
+
+		def settings_payment
+
+		end
+
+		def settings_payment_update
+
+		end	
+
+		def settings_tax
+
+		end
+
+
+		  private
+
+			def seller_params
+			  params.require(:seller).permit(:first_name, :last_name, :email, :password,
+			                               :password_confirmation)
+			end
+
+		  	def set_current_seller
+		    	return unless session[:seller_id]
+		    	@current_seller ||= Seller.find(session[:seller_id])
+		  	end
+
+			def require_login
+			    unless seller_logged_in?
+			      flash[:error] = "You must be logged in to access this section"
+			      redirect_to seller_login_path # halts request cycle
+			    end
+			end
+
+			def product_params
+			    params.require(:product).permit(:title, :description, :price, :quantity, {images: []}, {files: []}, {category_ids: []})
+			end
+
+			def set_current_product
+				return unless params[:id]
+				@product ||= Product.find(params[:id])
+			end
+	end
 end