merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Messages Updated!

This commit is contained in:
devansh bawari 2021-02-22 17:46:09 +05:30
parent 2ddfcd8548
commit fb8b0f64ca
2 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/Webkul/Paypal/src/Http/Controllers/SmartButtonController.php
View File

@ -61,7 +61,7 @@ class SmartButtonController extends Controller
try {
return response()->json($this->smartButton->createOrder($this->buildRequestBody()));
} catch (\Exception $e) {
throw $e;
return response()->json(json_decode($e->getMessage()), 400);
}
}
@ -76,7 +76,7 @@ class SmartButtonController extends Controller
$this->smartButton->captureOrder(request()->input('orderData.orderID'));
return $this->saveOrder();
} catch (\Exception $e) {
throw $e;
return response()->json(json_decode($e->getMessage()), 400);
}
}

38
packages/Webkul/Paypal/src/Resources/views/checkout/onepage/paypal-smart-button.blade.php
View File

@ -14,6 +14,12 @@
</style>
<script>
let messages = {
universalError: "Something went wrong!",
sdkValidationError: "SDK Validation Error: 'Client ID not recognized for either production or sandbox: {{ core()->getConfigData('sales.paymentmethods.paypal_smart_button.client_id') }}'",
authorizationError: "Client ID and Client Secret should be valid!"
};
window.onload = (function() {
eventBus.$on('after-payment-method-selected', function(payment) {
if (payment.method != 'paypal_smart_button') {
@ -23,11 +29,7 @@
}
if (typeof paypal == 'undefined') {
window.flashMessages = [{'type': 'alert-error', 'message': "SDK Validation error: 'client-id not recognized for either production or sandbox: {{core()->getConfigData('sales.paymentmethods.paypal_smart_button.client_id')}}'" }];
window.flashMessages.alertMessage = "SDK Validation error: 'client-id not recognized for either production or sandbox: {{core()->getConfigData('sales.paymentmethods.paypal_smart_button.client_id')}}'";
app.addFlashMessages();
options.alertBox(messages.sdkValidationError);
return;
}
@ -40,6 +42,12 @@
enableStandardCardFields: false,
alertBox: function (message) {
window.flashMessages = [{'type': 'alert-error', 'message': message }];
window.flashMessages.alertMessage = message;
app.addFlashMessages();
},
createOrder: function(data, actions) {
return window.axios.get("{{ route('paypal.smart-button.create-order') }}")
.then(function(response) {
@ -48,7 +56,13 @@
.then(function(orderData) {
return orderData.id;
})
.catch(function (error) {})
.catch(function (error) {
if (error.response.data.error === 'invalid_client') {
options.alertBox(messages.authorizationError);
}
options.alertBox(messages.universalError);
});
},
onApprove: function(data, actions) {
@ -72,18 +86,6 @@
.catch(function (error) {
window.location.href = "{{ route('shop.checkout.cart.index') }}";
})
},
onCancel: function (data) {
console.log('Canceled payment...');
},
onError: function (err) {
window.flashMessages = [{'type': 'alert-error', 'message': err }];
window.flashMessages.alertMessage = err;
app.addFlashMessages();
}
};