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

Merge branch 'master' into duplicate_order_issue

This commit is contained in:
devansh bawari 2021-02-23 18:10:36 +05:30
parent 0f67bbe95f c4148f31fa
commit 09e876e747
20 changed files with 1860 additions and 1756 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env.testing
View File

@ -1,6 +1,6 @@
APP_NAME=Laravel
APP_ENV=local
APP_VERSION=1.2.0
APP_VERSION=1.3.1
APP_KEY=base64:G4KY3tUsTaY9ONo1n/QyJvVLQZdJDgbIkSJswFK01HE=
APP_DEBUG=true
APP_URL=http://localhost

754
CHANGELOG for v0.1.x.md
View File

File diff suppressed because it is too large Load Diff

8
CHANGELOG for v0.2.x.md
View File

@ -1,17 +1,17 @@
# CHANGELOG for v0.2.x
#### This changelog consists the bug & security fixes and new features being included in the releases listed below.
This changelog consists the bug & security fixes and new features being included in the releases listed below.
## **v0.2.0 (23th of December, 2019)** - *Release*
* #1955 [fixed] - Message need to be changed on mouse hover on cross symbol next to applied coupon.
* #1959 [fixed] - if admin has set the same condition twice, then catalog rule is not getting apply
* #1958 [fixed] - getting exception on front end, if action type is Buy x get y free in non couponable cart rule.
* #1957 [fixed] - if action type is Fixed Amount to Whole Cart, then apply to shipping option should get hide.
* #1955 [fixed] - Message need to be changed on mouse hover on cross symbol next to applied coupon.
* #1954 [fixed] - If any different tax category has been assigned to variants in configurable product, then while using tax category condition in cart rule, rule is not working properly.
* #1950 [fixed] - multiple catalog rule should not get get applied, if 1st one has been created as End Other Rules = yes
* #1950 [fixed] - multiple catalog rule should not get get applied, if 1st one has been created as End Other Rules = yes

2702
CHANGELOG for v1.x.x.md
View File

File diff suppressed because it is too large Load Diff

2
packages/Webkul/Admin/src/Resources/views/account/edit.blade.php
View File

@ -63,7 +63,7 @@
<accordian :title="'{{ __('admin::app.account.current-password') }}'" :active="true">
<div slot="body">
<div class="control-group" :class="[errors.has('current_password') ? 'has-error' : '']">
<label for="current_password">{{ __('admin::app.account.current-password') }}</label>
<label for="current_password" class="required">{{ __('admin::app.account.current-password') }}</label>
<input type="password" v-validate="'required|min:6'" class="control" id="current_password" name="current_password" data-vv-as="&quot;{{ __('admin::app.account.current-password') }}&quot;"/>
<span class="control-error" v-if="errors.has('current_password')">@{{ errors.first('current_password') }}</span>
</div>

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);
}
}

4
packages/Webkul/Paypal/src/Providers/PaypalServiceProvider.php
View File

@ -15,6 +15,8 @@ class PaypalServiceProvider extends ServiceProvider
{
include __DIR__ . '/../Http/routes.php';
$this->loadTranslationsFrom(__DIR__ . '/../Resources/lang', 'paypal');
$this->loadViewsFrom(__DIR__ . '/../Resources/views', 'paypal');
$this->app->register(EventServiceProvider::class);
@ -29,7 +31,7 @@ class PaypalServiceProvider extends ServiceProvider
{
$this->registerConfig();
}
/**
* Register package config.
*

9
packages/Webkul/Paypal/src/Resources/lang/ar/app.php Normal file
View File

@ -0,0 +1,9 @@
<?php
return [
'error' => [
'universal-error' => 'Something went wrong!',
'sdk-validation-error' => 'Client ID not recognized for either production or sandbox!',
'authorization-error' => 'Client ID and Client Secret should be valid!'
]
];

9
packages/Webkul/Paypal/src/Resources/lang/de/app.php Normal file
View File

@ -0,0 +1,9 @@
<?php
return [
'error' => [
'universal-error' => 'Something went wrong!',
'sdk-validation-error' => 'Client ID not recognized for either production or sandbox!',
'authorization-error' => 'Client ID and Client Secret should be valid!'
]
];

9
packages/Webkul/Paypal/src/Resources/lang/en/app.php Normal file
View File

@ -0,0 +1,9 @@
<?php
return [
'error' => [
'universal-error' => 'Something went wrong!',
'sdk-validation-error' => 'Client ID not recognized for either production or sandbox!',
'authorization-error' => 'Client ID and Client Secret should be valid!'
]
];

9
packages/Webkul/Paypal/src/Resources/lang/fa/app.php Normal file
View File

@ -0,0 +1,9 @@
<?php
return [
'error' => [
'universal-error' => 'Something went wrong!',
'sdk-validation-error' => 'Client ID not recognized for either production or sandbox!',
'authorization-error' => 'Client ID and Client Secret should be valid!'
]
];

9
packages/Webkul/Paypal/src/Resources/lang/it/app.php Normal file
View File

@ -0,0 +1,9 @@
<?php
return [
'error' => [
'universal-error' => 'Something went wrong!',
'sdk-validation-error' => 'Client ID not recognized for either production or sandbox!',
'authorization-error' => 'Client ID and Client Secret should be valid!'
]
];

9
packages/Webkul/Paypal/src/Resources/lang/ja/app.php Normal file
View File

@ -0,0 +1,9 @@
<?php
return [
'error' => [
'universal-error' => 'Something went wrong!',
'sdk-validation-error' => 'Client ID not recognized for either production or sandbox!',
'authorization-error' => 'Client ID and Client Secret should be valid!'
]
];

9
packages/Webkul/Paypal/src/Resources/lang/nl/app.php Normal file
View File

@ -0,0 +1,9 @@
<?php
return [
'error' => [
'universal-error' => 'Something went wrong!',
'sdk-validation-error' => 'Client ID not recognized for either production or sandbox!',
'authorization-error' => 'Client ID and Client Secret should be valid!'
]
];

9
packages/Webkul/Paypal/src/Resources/lang/pl/app.php Normal file
View File

@ -0,0 +1,9 @@
<?php
return [
'error' => [
'universal-error' => 'Something went wrong!',
'sdk-validation-error' => 'Client ID not recognized for either production or sandbox!',
'authorization-error' => 'Client ID and Client Secret should be valid!'
]
];

9
packages/Webkul/Paypal/src/Resources/lang/pt_BR/app.php Normal file
View File

@ -0,0 +1,9 @@
<?php
return [
'error' => [
'universal-error' => 'Something went wrong!',
'sdk-validation-error' => 'Client ID not recognized for either production or sandbox!',
'authorization-error' => 'Client ID and Client Secret should be valid!'
]
];

9
packages/Webkul/Paypal/src/Resources/lang/tr/app.php Normal file
View File

@ -0,0 +1,9 @@
<?php
return [
'error' => [
'universal-error' => 'Something went wrong!',
'sdk-validation-error' => 'Client ID not recognized for either production or sandbox!',
'authorization-error' => 'Client ID and Client Secret should be valid!'
]
];

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

@ -14,8 +14,14 @@
</style>
<script>
let messages = {
universalError: "{{ __('paypal::app.error.universal-error') }}",
sdkValidationError: "{{ __('paypal::app.error.sdk-validation-error') }}",
authorizationError: "{{ __('paypal::app.error.authorization-error') }}"
};
window.onload = (function() {
eventBus.$on('after-payment-method-selected', function(payment) {
eventBus.$on('after-payment-method-selected', function (payment) {
if (payment.method != 'paypal_smart_button') {
$('.paypal-buttons').remove();
@ -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;
}
@ -38,8 +40,16 @@
shape: 'rect',
},
authorizationFailed: false,
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 +58,14 @@
.then(function(orderData) {
return orderData.id;
})
.catch(function (error) {})
.catch(function (error) {
if (error.response.data.error === 'invalid_client') {
options.authorizationFailed = true;
options.alertBox(messages.authorizationError);
}
return error;
});
},
onApprove: function(data, actions) {
@ -74,16 +91,10 @@
})
},
onCancel: function (data) {
console.log('Canceled payment...');
},
onError: function (err) {
window.flashMessages = [{'type': 'alert-error', 'message': err }];
window.flashMessages.alertMessage = err;
app.addFlashMessages();
onError: function (error) {
if (! options.authorizationFailed) {
options.alertBox(error);
}
}
};

3
packages/Webkul/Product/src/Repositories/ProductFlatRepository.php
View File

@ -130,7 +130,8 @@ class ProductFlatRepository extends Repository
$allFilterableAttributes = array_filter(array_unique(array_intersect($categoryFilterableAttributes, $productCategoryArrributes['attributes'])));
$attributes = app('Webkul\Attribute\Repositories\AttributeRepository')->getModel()::with(['options' => function($query) use ($productCategoryArrributes) {
return $query->whereIn('id', $productCategoryArrributes['attributeOptions']);
return $query->whereIn('id', $productCategoryArrributes['attributeOptions'])
->orderBy('sort_order');
}
])->whereIn('id', $allFilterableAttributes)->get();

2
resources/themes/.gitignore vendored Executable file
View File

@ -0,0 +1,2 @@
*
!.gitignore