Skip to content

Commit

Permalink
Merge pull request #214 from enupal/bugfix/checkout-session
Browse files Browse the repository at this point in the history
Fixes issue on create-checkout-session #213 and fixes issue on #193
  • Loading branch information
andrelopez committed Sep 9, 2021
2 parents 018ace6 + 67d013d commit af35ab9
Show file tree
Hide file tree
Showing 9 changed files with 12,338 additions and 16,754 deletions.
6 changes: 3 additions & 3 deletions mix-manifest.json
@@ -1,6 +1,6 @@
{
"/src/resources/stripe/dist/js/enupal-stripe-elements.min.js": "/src/resources/stripe/dist/js/enupal-stripe-elements.min.js",
"/src/resources/stripe/dist/js/enupal-stripe.min.js": "/src/resources/stripe/dist/js/enupal-stripe.min.js",
"/src/resources/stripe/dist/css/enupal-button.min.css": "/src/resources/stripe/dist/css/enupal-button.min.css",
"/src/resources/stripe/dist/css/enupal-stripe-elements.min.css": "/src/resources/stripe/dist/css/enupal-stripe-elements.min.css"
"/src/resources/stripe/dist/js/enupal-stripe-elements.min.js": "/src/resources/stripe/dist/js/enupal-stripe-elements.min.js",
"/src/resources/stripe/dist/css/enupal-stripe-elements.min.css": "/src/resources/stripe/dist/css/enupal-stripe-elements.min.css",
"/src/resources/stripe/dist/css/enupal-button.min.css": "/src/resources/stripe/dist/css/enupal-button.min.css"
}
29,064 changes: 12,324 additions & 16,740 deletions package-lock.json

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions package.json
Expand Up @@ -3,17 +3,16 @@
"license": "proprietary",
"scripts": {
"watch": "npm run build -- --watch",
"build": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
"build": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --config=node_modules/laravel-mix/setup/webpack.config.js"
},
"dependencies": {},
"devDependencies": {
"autoprefixer": "^9.8.6",
"craftcms-sass": "^3.5.1",
"cross-env": "^7.0.2",
"eslint": "^6.8.0",
"eslint-config-airbnb-base": "^14.2.1",
"eslint-plugin-import": "^2.22.1",
"laravel-mix": "^5.0.9",
"laravel-mix": "^6.0.29",
"resolve-url-loader": "^3.1.2",
"sass": "^1.29.0",
"sass-loader": "^8.0.2",
Expand Down
3 changes: 2 additions & 1 deletion src/jobs/SyncSubscriptionPayments.php
Expand Up @@ -66,7 +66,7 @@ public function execute($queue)
$endDate = strtotime($this->endDate);

$params = [
'date' => [
'created' => [
'gte' => $startDate,
'lte' => $endDate
]
Expand Down Expand Up @@ -192,6 +192,7 @@ public function execute($queue)
}
}else{
$alreadyExists++;
Craft::info('Skipping '.$subscriptionId, __METHOD__);
}
}else{
$skipped++;
Expand Down
2 changes: 1 addition & 1 deletion src/resources/stripe/dist/css/enupal-button.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/resources/stripe/dist/js/enupal-stripe-elements.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/resources/stripe/dist/js/enupal-stripe.min.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions src/resources/stripe/src/js/enupal-stripe.js
Expand Up @@ -202,7 +202,7 @@ var enupalStripe = {};
var isRecurring = this.getIsRecurring(enupalButtonElement, enupalStripeData);

var data = {
'action': 'enupal-stripe/coupons/validate',
'action': '/enupal-stripe/coupons/validate',
'amount' : amount,
'couponCode': couponCode,
'isRecurring': isRecurring,
Expand Down Expand Up @@ -301,7 +301,7 @@ var enupalStripe = {};
data.push({name: 'enupalStripe[enupalAllowPromotionCodes]', value: enupalStripeDataSubmission.allowPromotionCodes});
data.push({name: 'enupalStripe[enupalRemoveDefaultItem]', value: enupalStripeDataSubmission.removeDefaultItem});

data.push({name: 'action', value: 'enupal-stripe/checkout/create-session'});
data.push({name: 'action', value: '/enupal-stripe/checkout/create-session'});
data.push({name: 'enupalStripeData', value: JSON.stringify(enupalStripeDataSubmission)});

$.ajax({
Expand Down Expand Up @@ -338,7 +338,7 @@ var enupalStripe = {};
var isRecurring = this.getIsRecurring(enupalButtonElement, enupalStripeData);
if (couponCode){
var data = {
'action': 'enupal-stripe/coupons/validate',
'action': '/enupal-stripe/coupons/validate',
'amount' : stripeConfig.amount,
'couponCode': couponCode,
'isRecurring': isRecurring,
Expand Down

0 comments on commit af35ab9

Please sign in to comment.