Merge pull request #198 from claucece/develop

Braintree_implementation

2 files changed, 47 insertions, 17 deletions

diff --git a/engines/billing/config/locales/en.yml b/engines/billing/config/locales/en.yml
index 1300958..0bc167f 100644
--- a/engines/billing/config/locales/en.yml
+++ b/engines/billing/config/locales/en.yml
@@ -8,4 +8,32 @@ en:
   plan: "Plan"
   description: "Description"
   cost: "Cost"
-  free: "Free"
\ No newline at end of file
+  free: "Free"
+  #payments (all have spanish trans)
+  #donations
+  new_donation: "New Donation"
+  donation_info: "Please enter your donation details (this is a donation and will not be applied towards your account, if you have one):"
+  donation_amount: "Enter amount"
+  donate: "Donate"
+  donation_sucess: "Congratulations! Your transaction has been successfull!"
+  donation_not_sucess: "Something went wrong while processing your donation. Please try again!"
+  #subscriptions
+  subscription_sucess: "Congratulations! Your are now subscribed"
+  subscription_not_sucess: "Something went wrong while processing your subscription. Please try again"
+  unsubscription_sucess: "You have been unsubscribed!"
+  unsubscription_not_sucess: "Something went wrong. Please try again!"
+  subscriptions: "Subscriptions"
+  lastestsubs: "Lastest Subscriptions:"
+  date: "Date"
+  unsubscribe_from: "Unsuscribe from"
+  no_subs: "No Subscriptions"
+  choose_subs: "Choose Subscription:"
+  choose_button: "Choose"
+  new_subs: "New Subscription"
+  #common
+  first_name: "First Name"
+  last_name: "Last Name"
+  company: "Company"
+  phone: "Phone"
+  personal_info: "Please enter your personal info:"
+  pay_details: "Please enter payment details"
diff --git a/engines/billing/config/routes.rb b/engines/billing/config/routes.rb
index 6bbe501..357c55b 100644
--- a/engines/billing/config/routes.rb
+++ b/engines/billing/config/routes.rb
@@ -1,25 +1,27 @@
 Rails.application.routes.draw do
 
   scope "(:locale)", :locale => CommonLanguages.match_available do
-    match 'payments/new' => 'payments#new', :as => :new_payment
-    match 'payments/confirm' => 'payments#confirm', :as => :confirm_payment
-    resources :users do
-      resources :payments, :only => [:index]
-      resources :subscriptions, :only => [:index, :show, :destroy]
-    end
 
-    resources :customer, :only => [:new, :edit]
-    resources :credit_card_info, :only => [:edit]
+  get 'payments/new' => 'payments#new', :as => :new_payment
+  post 'payments/confirm' => 'payments#confirm', :as => :confirm_payment
+  #  match 'payments/new' => 'payments#new', :as => :new_payment
+  #  match 'payments/confirm' => 'payments#confirm', :as => :confirm_payment
+  #resources :users do
+  # resources :payments, :only => [:new, :confirm]
+  #  resources :subscriptions, :only => [:index, :destroy]
+  #end
+  resources :subscriptions, :only => [:index, :show] do
+    member do
+      post 'subscribe'
+      delete 'unsubscribe'
+    end
+  end
 
-    match 'customer/confirm/' => 'customer#confirm', :as => :confirm_customer
-    match 'customer/show/:id' => 'customer#show', :as => :show_customer
-    match 'credit_card_info/confirm' => 'credit_card_info#confirm', :as => :confirm_credit_card_info
+  resources :customer, :only => [:new, :edit]
 
-    resources :subscriptions, :only => [:new, :create, :update] # index, show & destroy are within users path
-    match 'billing_admin' => 'billing_admin#show', :as => :billing_admin
+  match 'customer/confirm/' => 'customer#confirm', :as => :confirm_customer
+  match 'customer/show/:id' => 'customer#show', :as => :show_customer
 
-    #match 'transactions/:product_id/new' => 'transactions#new', :as => :new_transaction
-    #match 'transactions/confirm/:product_id' => 'transactions#confirm', :as => :confirm_transaction
+  match 'billing_admin' => 'billing_admin#show', :as => :billing_admin
   end
-
 end