This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/skin/frontend/default/default/js/softprodigy/checkout/opcheckout.js b/skin/frontend/default/default/js/softprodigy/checkout/opcheckout.js | |
index cf0d759..afc2423 100644 | |
--- a/skin/frontend/default/default/js/softprodigy/checkout/opcheckout.js | |
+++ b/skin/frontend/default/default/js/softprodigy/checkout/opcheckout.js | |
@@ -95,6 +95,15 @@ Checkout.prototype = { | |
var url = this.blocks[stepId].url; | |
var data = this.getStepValues(stepId); | |
data['blocks'] = this.getBlocksToReloadByType(stepId); | |
+ if (typeof payment != 'undefined' && payment.currentMethod == 'cryozonic_stripe') | |
+ { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/skin/frontend/base/default/typostores/onestepcheckout/opcheckout.js b/skin/frontend/base/default/typostores/onestepcheckout/opcheckout.js | |
index de885a6..7e41327 100755 | |
--- a/skin/frontend/base/default/typostores/onestepcheckout/opcheckout.js | |
+++ b/skin/frontend/base/default/typostores/onestepcheckout/opcheckout.js | |
@@ -100,9 +100,32 @@ | |
}); | |
this.element | |
.on('click', this.options.checkout.continueSelector, function(e) { | |
+ var me = this; | |
e.preventDefault(); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<?php | |
protected function getTrialDays($details) | |
{ | |
switch ($details['trial_period_unit']) { | |
case null: | |
$days = 0; | |
break; | |
case 'day': | |
$days = $details['trial_period_frequency']; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/js/olegnax_osc/osc_form.js b/js/olegnax_osc/osc_form.js | |
index 2030f11..e093e31 100644 | |
--- a/js/olegnax_osc/osc_form.js | |
+++ b/js/olegnax_osc/osc_form.js | |
@@ -915,10 +915,22 @@ OnestepcheckoutForm.prototype = { | |
classThis.placeOrderButton.addClassName(classThis.disabledClassName); | |
classThis.placeOrderButton.disabled = true; | |
- new Ajax.Request(classThis.placeOrderUrl, { | |
- method: 'post', |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/app/design/frontend/base/default/template/tm/firecheckout/patches/stripe/form/stripe.phtml b/app/design/frontend/base/default/template/tm/firecheckout/patches/stripe/form/stripe.phtml | |
index d5ed0e88a..15e0396d4 100755 | |
--- a/app/design/frontend/base/default/template/tm/firecheckout/patches/stripe/form/stripe.phtml | |
+++ b/app/design/frontend/base/default/template/tm/firecheckout/patches/stripe/form/stripe.phtml | |
@@ -214,40 +214,9 @@ function stripeResponseHandler(status, response) { | |
Event.observe(window, 'load', function(e) { | |
if ($('onestepcheckout-form')) { | |
$$('.onestepcheckout-place-order-wrapper').each(function(elem){$(elem).replace('<div class="onestepcheckout-place-order-wrapper"><button type="button" title="Place order now" id="onestepcheckout-check-order" class="large orange onestepcheckout-button onestepcheckout-check-order" onclick="javascript:void(0);"><span><span>Place order now</span></span></button></div>')}); | |
- $('onestepcheckout-check-order').ob |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<?php | |
function getAdminToken() | |
{ | |
$url = 'https://example.com/rest/default/V1/integration/admin/token'; | |
$data = [ | |
"username" => "user", | |
"password" => "user_password" | |
]; | |
$data_string = json_encode($data); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<?php | |
class SomeClass | |
{ | |
public function __construct( | |
\StripeIntegration\Payments\Helper\Generic $helper, | |
\Magento\Framework\Session\Generic $session, | |
\StripeIntegration\Payments\Model\Config $config, | |
\Magento\Checkout\Model\Cart $cart, | |
\Magento\Framework\Locale\Resolver $localeResolver |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/app/code/StripeIntegration/Payments/Helper/Generic.php b/src/app/code/StripeIntegration/Payments/Helper/Generic.php | |
index 37029bd91..ad23b5f78 100644 | |
--- a/src/app/code/StripeIntegration/Payments/Helper/Generic.php | |
+++ b/src/app/code/StripeIntegration/Payments/Helper/Generic.php | |
@@ -1858,7 +1858,10 @@ class Generic | |
try | |
{ | |
$this->cache->save($value = "1", $key, ["stripe_payments"], $lifetime = 60 * 60); | |
- $paymentObject->capture(array($amountToCapture => $stripeAmount)); | |
+ $paymentObject->capture([ |
OlderNewer