Initial sync of Pro 4.4.0

awesomemotive · Dec 6, 2021 · b0771f6 · b0771f6
1 parent 7874c73
commit b0771f6
Show file tree

Hide file tree

Showing 239 changed files with 7,753 additions and 954 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,36 +1,17 @@
-# PhpStorm
-.idea
-
-# Sublime
-*.sublime-project
-*.sublime-workspace
+.DS_Store
+ehthumbs.db
+Thumbs.db
 
-# Grunt
+*.cache
+composer.lock
+phpunit.xml
 node_modules
-
-# Bower
-/bower_components
-
-# Sass
 /.sass-cache
-
-# Tests
-phpunit.xml
-
-# Logs
 /logs
-
-# wordpress.org
 /build
-
-# Mac crap
-.DS_Store
-
-# Windows crap
-ehthumbs.db
-Thumbs.db
-
 /vendor/*/
 !/vendor/autoload.php
 !/vendor/composer/
-!/vendor/stripe/
+
+# PhpStorm
+.idea
diff --git a/composer.json b/composer.json
@@ -14,12 +14,15 @@
 	],
 	"autoload": {
 		"psr-4": {
+			"SimplePay\\Core\\": "src/",
 			"SimplePay\\Vendor\\": "lib/",
 			"SimplePay\\Vendor\\Stripe\\": "lib/Stripe/lib"
 		}
 	},
 	"require": {
 		"berlindb/core": "2.0",
+		"league/container": "2.5.0",
+		"psr/container": "1.0.0",
 		"stripe/stripe-php": "7.97.0"
 	},
 	"scripts": {
@@ -33,6 +36,7 @@
 			"classmap_prefix": "SimplePay_",
 			"packages": [
 				"berlindb/core",
+				"league/container",
 				"stripe/stripe-php"
 			],
 			"delete_vendor_directories": true,

diff --git a/composer.lock b/composer.lock
diff --git a/includes/core/abstracts/abstract-custom-field.php b/includes/core/abstracts/abstract-custom-field.php
@@ -3,7 +3,7 @@
  * Custom field
  *
  * @package SimplePay\Core\Abstracts
- * @copyright Copyright (c) 2020, Sandhills Development, LLC
+ * @copyright Copyright (c) 2021, Sandhills Development, LLC
  * @license http://opensource.org/licenses/gpl-2.0.php GNU Public License
  * @since 3.0.0
  */

diff --git a/includes/core/abstracts/abstract-field.php b/includes/core/abstracts/abstract-field.php
@@ -3,7 +3,7 @@
  * Setting field
  *
  * @package SimplePay\Core\Abstracts
- * @copyright Copyright (c) 2020, Sandhills Development, LLC
+ * @copyright Copyright (c) 2021, Sandhills Development, LLC
  * @license http://opensource.org/licenses/gpl-2.0.php GNU Public License
  * @since 3.0.0
  */

diff --git a/includes/core/abstracts/abstract-form.php b/includes/core/abstracts/abstract-form.php
@@ -3,7 +3,7 @@
  * Payment form
  *
  * @package SimplePay\Core\Abstracts
- * @copyright Copyright (c) 2020, Sandhills Development, LLC
+ * @copyright Copyright (c) 2021, Sandhills Development, LLC
  * @license http://opensource.org/licenses/gpl-2.0.php GNU Public License
  * @since 3.0.0
  */

diff --git a/includes/core/admin/class-assets.php b/includes/core/admin/class-assets.php
@@ -3,7 +3,7 @@
  * Admin assets
  *
  * @package SimplePay\Core\Admin
- * @copyright Copyright (c) 2020, Sandhills Development, LLC
+ * @copyright Copyright (c) 2021, Sandhills Development, LLC
  * @license http://opensource.org/licenses/gpl-2.0.php GNU Public License
  * @since 3.0.0
  */
@@ -75,7 +75,7 @@ public function setup() {
 		$this->scripts = array(
 			'simpay-chosen'     => array(
 				'src'    => SIMPLE_PAY_INC_URL . 'core/assets/js/vendor/chosen.jquery.min.js',
-				'deps'   => array( 'jquery', 'jquery-ui-sortable' ),
+				'deps'   => array( 'jquery', 'jquery-ui-dialog', 'jquery-ui-sortable' ),
 				'ver'    => SIMPLE_PAY_VERSION,
 				'footer' => false,
 			),
@@ -114,7 +114,7 @@ public function setup() {
 			),
 			'simpay-admin'  => array(
 				'src'   => SIMPLE_PAY_INC_URL . 'core/assets/css/simpay-admin.min.css',
-				'deps'  => array( 'simpay-chosen' ),
+				'deps'  => array( 'simpay-chosen', 'wp-jquery-ui-dialog' ),
 				'ver'   => SIMPLE_PAY_VERSION,
 				'media' => 'all',
 			),
@@ -159,6 +159,26 @@ public function register() {
 					wp_register_script( $script, $values['src'], $values['deps'], $values['ver'], $values['footer'] );
 				}
 			}
+
+			if ( isset( $this->scripts['simpay-admin'] ) ) {
+				wp_localize_script(
+					'simpay-admin',
+					'simpayAdmin',
+					array(
+						'siteTitle' => get_bloginfo( 'name' ),
+						'i18n'      => array(
+							'disconnectConfirm' => esc_html__(
+								'Disconnect',
+								'stripe'
+							),
+							'disconnectCancel'  => esc_html__(
+								'Cancel',
+								'stripe'
+							),
+						),
+					)
+				);
+			}
 		}
 	}