Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes issue on create-checkout-session #213 and fixes issue on #193 #214

Merged
merged 1 commit into from
Sep 9, 2021
Merged

Fixes issue on create-checkout-session #213 and fixes issue on #193 #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions mix-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
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
View file
Open in desktop
Original file line number Diff line number Diff line change
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
View file
Open in desktop

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/css/enupal-stripe-elements.min.css
View file
Open in desktop

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
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/resources/stripe/dist/js/enupal-stripe.min.js
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions src/resources/stripe/src/js/enupal-stripe.js
View file
Open in desktop
Original file line number Diff line number Diff line change
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