app_manager 1.1.3 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0c640524798e47cd645a79d60bc840921367fc60b1b1ece6e79b36a301ae356
-  data.tar.gz: fe5c22494e0aae4b47160a8e843849f2c2a6bb47fec46524a94b5a08cadb3bd3
+  metadata.gz: 3c7139d80f35a011691ed85a8f0d62f164210fc1a2e1ab830bdd29820f0dff49
+  data.tar.gz: 7ea3211619b2e2ff457bc87929bf3879dafe5471aa3771427137251f33f386f8
 SHA512:
-  metadata.gz: 20b42edc6c36fae16503025cd9fb6d412e497259533c58676c28a1243eb4948da563131e9a936d1c8892ae8b1f787722c1f67d091150a452a2cc76c7169d7f37
-  data.tar.gz: d6ba02cd74805775d92dc1459dd3670e649379a4fb4c8f220c408c69ff59037f9ae196a3794b70d5d0f962d9255bc7003f68e272e2242baa087067b1a3c5f2d5
+  metadata.gz: fccc462df489a3ddfcd71a371b0ab41ca35e0358fcbc0220f1ef477d8fabf6419036b5ce4b37d4d33f3f93b2426987c0ef8588b6a9cce5d3025dc98330d28d02
+  data.tar.gz: af2479eee70e4bcb9be2503b45fa09a70eae273c8f46357642000dc7f8d9dc5b821e7c5393caba6f1b87245c8b72fcf0d75ee07253d4f25b2214f038874da68e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    app_manager (1.1.3)
+    app_manager (1.1.6)
       httparty
       kaminari (>= 0.16.3)
       rails (>= 5.2.0)
@@ -147,7 +147,7 @@ GEM
     public_suffix (4.0.6)
     racc (1.6.0)
     rack (2.2.3.1)
-    rack-test (2.0.0)
+    rack-test (2.0.2)
       rack (>= 1.3)
     rails (7.0.3)
       actioncable (= 7.0.3)

data/README.md

@@ -168,9 +168,9 @@ and then you can use follwing methods with your shop objects.
 
 @shop.get_remaining_days # return integer based on trial activated date.
 
-@shop.get_plan # return integer based on trial activated date.
+@shop.get_plan # return current plan hash
 
-@shop.get_charge # return integer based on trial activated date.
+@shop.get_charge # return current charge hash
 ```
 
 

data/app/controllers/app_manager/plans_controller.rb

@@ -70,12 +70,27 @@ module AppManager
 
 		def users
 			if model
-				if params[:search]
+				
 				search = params[:search]
+				sort = params[:sort] || AppManager.configuration.field_names['created_at']
+				order = params[:order] || 'asc'
+				plans = params[:plans] || nil
+				plans = plans.values if !plans.nil?
+				shopify_plans = params[:shopify_plans] || nil
+				shopify_plans = shopify_plans.values if !shopify_plans.nil?
+				items_per_page = params[:itemsPerPage] || 25
 				@shopify_email = AppManager.configuration.field_names['shopify_email']
-				data = model.where("#{@shopify_domain} LIKE :search OR #{@shopify_email} LIKE :search", search: "%#{search}%").page(params[:page]).per(10)
+				@shopify_plan_name_field = AppManager.configuration.field_names['shopify_plan']
+				data = model
+				if params[:search]	
+				data = model.where("#{@shopify_domain} LIKE :search OR #{@shopify_email} LIKE :search", search: "%#{search}%")
+				data = data.where(@plan_field => plans) if !plans.nil?
+				data = data.where(@shopify_plan_name_field => shopify_plans) if !shopify_plans.nil?
+				data = data.page(params[:page]).per(items_per_page)
 				else
-				data = model.page(params[:page]).per(10)
+				data = model.where(@plan_field => plans) if !plans.nil?
+				data = data.where(@shopify_plan_name_field => shopify_plans) if !shopify_plans.nil?
+				data = data.page(params[:page]).per(items_per_page)
 				end
 				users = {
 				"current_page" => data && data.current_page ? data.current_page : 0,

data/lib/app_manager/client/connection.rb

@@ -60,9 +60,9 @@ module AppManager
         @fs = AppManager::FailSafe.new
         case path
         when "static-contents"
-          return @fs.get_local_app_structures
+          return @fs.get_local_app_structures 
         when 'plans'
-          return @fs.get_local_plans(params)
+          return @fs.get_local_plans(params) 
         when 'plan'
           return @fs.get_local_plan(params)
         when 'store-charge'
@@ -70,7 +70,7 @@ module AppManager
         when 'cancel-charge'
           return @fs.store_cancel_charge(params,options)
         when 'get-remaining-days' 
-          return @fs.get_local_remaining_days(params,options)
+          return @fs.get_local_remaining_days(params,options) 
         when 'get-charge'
           return @fs.get_local_charge(params,options)  
         else

data/lib/app_manager/fail_safe.rb

@@ -1,13 +1,23 @@
 require 'json'
 require 'date'
 require 'time'
+require "fileutils"
+
 module AppManager
 
 	class FailSafe
 
 		def initialize(db_name='app_manager_local')
 			@apm_db = SQLite3::Database.open "db/#{db_name}.db"
+			FileUtils.chmod 0755, "db/#{db_name}.db"
 			@apm_db.results_as_hash = true
+			create_plan_table
+			create_charges_table
+			create_apps_table
+			create_app_structures_table
+			create_discount_plans_table
+			create_extend_trials_table
+			create_plan_users_table
 		end
 
 		def save_api_data(params)	
@@ -50,7 +60,7 @@ module AppManager
 
 		def save_api_plans(plans)
 		   	@apm_db.execute("DROP TABLE IF EXISTS plans;")
-				@apm_db.execute "CREATE TABLE IF NOT EXISTS plans(id integer,type varchar(255),  name varchar(255),  price float,  offer_text varchar(255), description varchar(255),  interval text,  shopify_plans text,  trial_days integer,  test boolean,  on_install integer,  is_custom boolean,  app_id integer,  base_plan integer,  created_at datetime,  updated_at datetime,  public boolean,  discount integer,  cycle_count integer,  store_base_plan boolean,  choose_later_plan boolean,  discount_type varchar(255),  affiliate text,  features text, deleted_at datetime)"
+			create_plan_table
 		
 		   if plans.any?
 				plans.each do |plan|
@@ -75,7 +85,7 @@ module AppManager
 
 		def save_api_charges(charges)
 			@apm_db.execute("DROP TABLE IF EXISTS charges;")
-			@apm_db.execute "CREATE TABLE IF NOT EXISTS charges(id INTEGER PRIMARY KEY,charge_id varchar(255),test boolean, status varchar(255),name varchar(255), type varchar(255), price float,interval varchar(255),trial_days integer,billing_on datetime,activated_on datetime,trial_ends_on datetime,cancelled_on datetime, expires_on datetime,plan_id integer,description text,shop_domain varchar(255),created_at datetime, updated_at datetime, app_id integer,  sync boolean DEFAULT 0,process_type varchar(255))"
+			create_charges_table
 			if charges.any?
 					charges.each do |charge|
 					charge_test = charge['test'] ? 1 : 0
@@ -87,7 +97,7 @@ module AppManager
 
 		def save_api_apps(apps)
 			@apm_db.execute("DROP TABLE IF EXISTS apps;")
-			@apm_db.execute "CREATE TABLE IF NOT EXISTS apps(id integer,name varchar(255),slug varchar(255),url varchar(255),image varchar(255),api_token varchar(255),slack varchar(255), created_at datetime, updated_at datetime)"
+			create_apps_table
 		  if apps.any?
 			apps.each do |app|
 			@apm_db.execute("INSERT INTO apps (id ,name ,slug ,url ,image ,api_token ,slack , created_at , updated_at ) VALUES (?,?,?,?,?,?,?,?,?)", app['id'],app['name'],app['slug'],app['url'],app['image'],app['api_token'],app['slack'],app['created_at'],app['updated_at'])
@@ -98,15 +108,15 @@ module AppManager
 
 		def save_api_app_structures(app_structures)
 			@apm_db.execute("DROP TABLE IF EXISTS app_structures;")
-			@apm_db.execute "CREATE TABLE IF NOT EXISTS app_structures(banners text)"
+			create_app_structures_table
 			if !app_structures.nil?
 			@apm_db.execute("INSERT INTO app_structures (banners) VALUES (?)", "#{app_structures.to_h}")
 			end
 		end
 
 		def save_api_discount_plans(discount_plans)
-				@apm_db.execute("DROP TABLE IF EXISTS discount_plans;")
-				@apm_db.execute "CREATE TABLE IF NOT EXISTS discount_plans(id integer,discount integer,shop_domain varchar(255),cycle_count integer,plan_id integer, created_by integer,created_at datetime,updated_at datetime,app_id integer,discount_type varchar(255))"
+		@apm_db.execute("DROP TABLE IF EXISTS discount_plans;")
+		create_discount_plans_table
        if discount_plans.any?
 				discount_plans.each do |discount_plan|
 				@apm_db.execute("INSERT INTO discount_plans (id ,discount ,shop_domain ,cycle_count ,plan_id , created_by ,created_at ,updated_at ,app_id ,discount_type ) VALUES (?,?,?,?,?,?,?,?,?,?)", discount_plan['id'],discount_plan['discount'],discount_plan['shop_domain'],discount_plan['cycle_count'],discount_plan['plan_id'],discount_plan['created_by'],discount_plan['created_at'],discount_plan['updated_at'],discount_plan['app_id'],discount_plan['discount_type'])
@@ -116,7 +126,7 @@ module AppManager
 
 		def save_api_extend_trials(extend_trials)
 			@apm_db.execute("DROP TABLE IF EXISTS extend_trials;")
-			@apm_db.execute "CREATE TABLE IF NOT EXISTS extend_trials(id integer,shop_domain varchar(255),plan_id integer,app_id integer,days integer,created_by integer,created_at datetime,updated_at datetime,extend_trial_start_at datetime)"
+			create_extend_trials_table
 			if extend_trials.any?
 				extend_trials.each do |extend_trial|
 				@apm_db.execute("INSERT INTO extend_trials (id ,shop_domain ,plan_id ,app_id ,days ,created_by ,created_at ,updated_at ,extend_trial_start_at ) VALUES (?,?,?,?,?,?,?,?,?)", extend_trial['id'], extend_trial['shop_domain'], extend_trial['plan_id'], extend_trial['app_id'], extend_trial['days'], extend_trial['created_by'], extend_trial['created_at'], extend_trial['updated_at'], extend_trial['extend_trial_start_at'])
@@ -126,7 +136,7 @@ module AppManager
 
 		def save_api_plan_users(plan_users)
 			@apm_db.execute("DROP TABLE IF EXISTS plan_users;")
-            @apm_db.execute "CREATE TABLE IF NOT EXISTS plan_users(id integer,shop_domain varchar(255),plan_id integer,created_by integer,created_at datetime,updated_at datetime)"
+            create_plan_users_table
             if plan_users.any?
 				plan_users.each do |plan_user|
 				@apm_db.execute("INSERT INTO plan_users (id ,shop_domain, plan_id, created_by, created_at, updated_at ) VALUES (?,?,?,?,?,?)", plan_user['id'], plan_user['shop_domain'], plan_user['plan_id'], plan_user['created_by'], plan_user['created_at'], plan_user['updated_at'])
@@ -150,6 +160,34 @@ module AppManager
 			return app_structures
 		end
 
+		def create_plan_table
+			@apm_db.execute "CREATE TABLE IF NOT EXISTS plans(id integer,type varchar(255),  name varchar(255),  price float,  offer_text varchar(255), description varchar(255),  interval text,  shopify_plans text,  trial_days integer,  test boolean,  on_install integer,  is_custom boolean,  app_id integer,  base_plan integer,  created_at datetime,  updated_at datetime,  public boolean,  discount integer,  cycle_count integer,  store_base_plan boolean,  choose_later_plan boolean,  discount_type varchar(255),  affiliate text,  features text, deleted_at datetime)"	
+		end
+
+		def create_charges_table
+			@apm_db.execute "CREATE TABLE IF NOT EXISTS charges(id INTEGER PRIMARY KEY,charge_id varchar(255),test boolean, status varchar(255),name varchar(255), type varchar(255), price float,interval varchar(255),trial_days integer,billing_on datetime,activated_on datetime,trial_ends_on datetime,cancelled_on datetime, expires_on datetime,plan_id integer,description text,shop_domain varchar(255),created_at datetime, updated_at datetime, app_id integer,  sync boolean DEFAULT 0,process_type varchar(255))"
+		end
+
+		def create_apps_table
+			@apm_db.execute "CREATE TABLE IF NOT EXISTS apps(id integer,name varchar(255),slug varchar(255),url varchar(255),image varchar(255),api_token varchar(255),slack varchar(255), created_at datetime, updated_at datetime)"
+		end
+
+		def create_app_structures_table
+			@apm_db.execute "CREATE TABLE IF NOT EXISTS app_structures(banners text)"	
+		end
+
+		def create_discount_plans_table
+			@apm_db.execute "CREATE TABLE IF NOT EXISTS discount_plans(id integer,discount integer,shop_domain varchar(255),cycle_count integer,plan_id integer, created_by integer,created_at datetime,updated_at datetime,app_id integer,discount_type varchar(255))"
+		end
+
+		def create_extend_trials_table
+			@apm_db.execute "CREATE TABLE IF NOT EXISTS extend_trials(id integer,shop_domain varchar(255),plan_id integer,app_id integer,days integer,created_by integer,created_at datetime,updated_at datetime,extend_trial_start_at datetime)"
+		end
+
+		def create_plan_users_table
+			@apm_db.execute "CREATE TABLE IF NOT EXISTS plan_users(id integer,shop_domain varchar(255),plan_id integer,created_by integer,created_at datetime,updated_at datetime)"
+		end
+
 
 		def get_local_plans(params)
 		    plans_data = []

data/lib/app_manager/model.rb

@@ -20,9 +20,9 @@ module AppManager
         if remaining_days > 0
             return true
         end
-        shopify_fields = @field_names = AppManager.configuration.field_names
         plan_obj = AppManager::Client.new
-        active_charge = plan_obj.get_charge(shopify_fields['name']) rescue nil
+        shop_domain = self[AppManager.configuration.shopify_domain_field]
+        active_charge = plan_obj.get_charge(shop_domain) rescue nil
         return active_charge['active_charge'].present? && !active_charge['active_charge'].nil? ? true : false
     end
 
@@ -134,7 +134,7 @@ module AppManager
             end
             return plan_data
         else
-            return 'feature_slugs is required'
+            return []
         end
     end
 

data/lib/app_manager/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AppManager
-  VERSION = "1.1.3"
+  VERSION = "1.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: app_manager
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.6
 platform: ruby
 authors:
 - Hulkapps
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-27 00:00:00.000000000 Z
+date: 2022-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty