payfast 1.0.2 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a4574ba86a681658b8f23c60ffd4139e6d59d6abc5017a78042f05b302624e4
-  data.tar.gz: 47ed239d23fcd5966db19cefdb119ad8b0366e61dfed31c21d80ad848508f4e9
+  metadata.gz: b5a6f5a5b16ce72d474b8b250b142131d6f216922159ea7356ba69a294fb1804
+  data.tar.gz: 8c59abe214f2abccb269bc7281f29598aec666fa75cbac8ce8b25bfe9c06e1b8
 SHA512:
-  metadata.gz: 3398d67e68303c866e80d60bafe730ee3093d9bddb18ab499d0f50017dc5fb3300ac512597fc7f8d49d73b1cbfdd74c362f881778d314e4845ddc47eb8727661
-  data.tar.gz: ab136a269460fb4d03de079ea2195a5aa9be3d5bea253c3046f948da648ef2e7992b2aa6849a9ddd4832d9d6a8b5c75477834c2cdf0b448a05c049a0446c2847
+  metadata.gz: ed5e16433177c3c510b5a857e9944e54522b87d80b5070263e697ec68cacb342fba2434fb0b6866b790738a8b7b034daa2f59b0f86a1325e623ab89b518b92b1
+  data.tar.gz: da9667701f2163b90e99da953cc32797142e5cec49f825d312e1e7950811e4b5f3ae35d14279c23155acf20442c5d265a631507868fe5707e59c5e17f196bce7

data/lib/generators/payfast/install_generator.rb

@@ -1,54 +1,71 @@
 require "rails/generators"
 
 module Payfast
-  class InstallGenerator < Rails::Generators::Base
-    source_root File.expand_path("templates", __dir__)
+  module Generators
+    class InstallGenerator < Rails::Generators::Base
+      source_root File.expand_path("templates", __dir__)
 
-    def modify_routes
-      insert_into_file "config/routes.rb", after: "Rails.application.routes.draw do\n" do
-        # Read and insert the contents of your routes template file
-        File.read(File.join(__dir__, "templates", "routes.rb"))
+      def modify_routes
+        insert_into_file "config/routes.rb", after: "Rails.application.routes.draw do\n" do
+          # Read and insert the contents of your routes template file
+          File.read(File.join(__dir__, "templates", "routes.rb"))
+        end
       end
-    end
 
-    def create_controller
-      template "controller.rb", File.join("app/controllers", "#{controller_file_name}_controller.rb")
-    end
+      def create_controller
+        template "controller.rb", File.join("app/controllers", "#{controller_file_name}_controller.rb")
+      end
 
-    def create_views
-      actions.each do |action|
-        template "#{action}.html.erb", File.join("app/views", controller_file_name, "#{action}.html.erb")
+      def create_views
+        actions.each do |action|
+          template "#{action}.html.erb", File.join("app/views", controller_file_name, "#{action}.html.erb")
+        end
       end
-    end
 
-    def create_view_helper
-      template "helper.rb", "app/helpers/carts_helper.rb"
-    end
+      def create_view_helper
+        template "helper.rb", "app/helpers/carts_helper.rb"
+      end
 
-    def create_migration
-      template "migration.rb", "db/migrate/#{timestamp}_create_carts.rb"
-    end
+      def create_migration
+        template "migration.rb", "db/migrate/#{timestamp}_create_carts.rb"
+      end
 
-    def create_config_file
-      template "config.yml", "config/payfast.yml"
-    end
+      def create_config_file
+        template "config.yml", "config/payfast.yml"
+      end
 
-    def create_model
-      template "model.rb", "app/models/cart.rb"
-    end
+      def create_model
+        template "model.rb", "app/models/cart.rb"
+      end
 
-    private
+      def add_erb_tag
+        # Append an ERB tag to the application.html.erb file
+        insert_into_file "app/views/layouts/application.html.erb", before: "</head>" do
+          "<%= payfast_script_tag %>"
+        end
+      end
 
-    def controller_file_name
-      "carts"
-    end
+      def configure_development
+        insert_into_file "config/environments/development.rb", before: /^end/ do
+          <<-RUBY.strip_heredoc.indent(2)
+              config.hosts << /[a-z0-9-]+\.ngrok-free\.app/
+          RUBY
+        end
+      end
 
-    def timestamp
-      Time.now.strftime("%Y%m%d%H%M%S")
-    end
+      private
 
-    def actions
-      %w(index make_payment)
+      def controller_file_name
+        "carts"
+      end
+
+      def timestamp
+        Time.now.strftime("%Y%m%d%H%M%S")
+      end
+
+      def actions
+        %w(index make_payment)
+      end
     end
   end
 end

data/lib/generators/payfast/templates/config.yml

@@ -1,7 +1,19 @@
+
+# Run rails EDITOR="code --wait" bin/rails credentials:edit
+
+# Add the following credentials from your payfast account.
+# payfast: 
+#   merchant_id: {your_merchant_id}
+#   merchant_key: {your_merchant_key}
+#   passphrase:  {{your_passphrase}}
+
+
+
 development:
-  merchant_id: <%#= Rails.application.credentials.payfast.merchant_id %>
-  merchant_key: <%#= Rails.application.credentials.payfast.merchant_key %>
-  passphrase:  <%#= Rails.application.credentials.payfast.passphrase %>
+  # Remove the comments below and wrap with erb tags 
+  merchant_id: # Rails.application.credentials.payfast.merchant_id 
+  merchant_key: # Rails.application.credentials.payfast.merchant_key 
+  passphrase:  # Rails.application.credentials.payfast.passphrase 
   base_url: https://sandbox.payfast.co.za/onsite/process
   # Replace with your own urls
   return_url: https://1c8e-102-69-134-39.ngrok-free.app/carts/return_url
@@ -9,9 +21,10 @@ development:
   notify_url: https://1c8e-102-69-134-39.ngrok-free.app/carts/notify
   js_bundle: https://sandbox.payfast.co.za/onsite/engine.js
 production:
-  merchant_id: <%#= Rails.application.credentials.payfast_merchant_id %>
-  merchant_key: <%#= Rails.application.credentials.payfast_merchant_key %>
-  passphrase:  <%#= Rails.application.credentials.passphrase %>
+  # Remove the comments below and wrap with erb tags 
+  merchant_id: # Rails.application.credentials.payfast.merchant_id 
+  merchant_key: # Rails.application.credentials.payfast.merchant_key 
+  passphrase:  # Rails.application.credentials.payfast.passphrase 
   base_url: https://www.payfast.co.za/onsite/process
   # Replace with your own urls
   return_url: https://1c8e-102-69-134-39.ngrok-free.app/carts/return_url

data/lib/generators/payfast/templates/controller.rb

@@ -1,3 +1,5 @@
+require "payfast/onsite_payments"
+
 class CartsController < ApplicationController
   def index
   end
@@ -32,11 +34,11 @@ class CartsController < ApplicationController
   def success
     @cart = Cart.find(params[:id])
     @cart.is_paid = true
-    redirect_to root_path, notice: "Transcation Successful"
+    redirect_to carts_path, notice: "Transcation Successful"
   end
 
   def failure
-    redirect_to root_path, notice: "Transcation Canceled"
+    redirect_to carts_path, notice: "Transcation Canceled"
   end
 
   private

data/lib/generators/payfast/templates/make_payment.html.erb

@@ -1,14 +1,14 @@
 
 <script>
-// set the uuid to  uuid = @cart.payment_uuid. surround @carts.payment_uuid with erb tags
+// set the uuid to  uuid = @cart.payment_uuid  wrap @carts.payment_uuid with erb tags
 const uuid = ``
 window.payfast_do_onsite_payment({uuid}, function (result) {
   if (result === true) {
-    // redirect success_cart_path(@cart)
+    // wrap success_cart_path(@cart) with erb tags and paste into the literal below
     window.location.href = ``
   }
   else {
-    // Redirect to  failure_cart_path(@cart)
+    // Redirect to  failure_cart_path(@cart) with erb tags and paste into the literal below
     window.location.href = ``
   }
 });

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: payfast
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.5
 platform: ruby
 authors:
 - Dellan Muchengapadare
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-23 00:00:00.000000000 Z
+date: 2023-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler