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

Merge branch 'master' of https://github.com/bagisto/bagisto into development

This commit is contained in:
rahul shukla 2019-09-12 18:31:56 +05:30
parent 5fd72de3a9 9a443b6f3b
commit 9eef8aed0a
7 changed files with 38 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
app/Console/Commands/BagistoInstall.php
View File

@ -62,41 +62,41 @@ class BagistoInstall extends Command
$APP_URL = $this->ask('[KEY = "APP_URL"] Please enter application URL (Optional, default = localhost)?');
$this->comment($APP_URL ?? 'localhost');
$this->changeEnvironmentVariable('APP_URL', $APP_URL);
$this->changeEnvironmentVariable('APP_URL', $APP_URL ?? 'http://localhost');
$DB_CONNECTION = $this->ask('[KEY = "DB_CONNECTION"] Enter database connection (Optional, default = mysql)?');
$this->comment($DB_CONNECTION ?? 'mysql');
$this->changeEnvironmentVariable('DB_CONNECTION', $DB_CONNECTION);
$this->changeEnvironmentVariable('DB_CONNECTION', $DB_CONNECTION ?? 'mysql');
$DB_HOST = $this->ask('[KEY = "DB_HOST"] Enter database host (Optional, default = 127.0.0.1)?');
$this->comment($DB_HOST ?? '127.0.0.1');
$this->changeEnvironmentVariable('DB_HOST', $DB_HOST);
$this->changeEnvironmentVariable('DB_HOST', $DB_HOST ?? '127.0.0.1');
$DB_PORT = $this->ask('[KEY = "DB_PORT"] Enter database port (Optional, default = 3306)?');
$this->comment($DB_PORT ?? '3306');
$this->changeEnvironmentVariable('DB_PORT', $DB_PORT);
$this->changeEnvironmentVariable('DB_PORT', $DB_PORT ?? '3306');
$DB_DATABASE = null;
while(! isset($DB_DATABASE)) {
while (!isset($DB_DATABASE)) {
$DB_DATABASE = $this->ask('[KEY = "DB_DATABASE"] Enter name of database?');
$this->comment($DB_DATABASE ?? 'forge');
}
$this->changeEnvironmentVariable('DB_DATABASE', $DB_DATABASE);
$this->changeEnvironmentVariable('DB_DATABASE', $DB_DATABASE ?? 'forge');
$DB_USERNAME = null;
while(! isset($DB_USERNAME)) {
while (!isset($DB_USERNAME)) {
$DB_USERNAME = $this->ask('Enter database username?');
$this->comment($DB_USERNAME ?? 'root');
}
$this->changeEnvironmentVariable('[KEY = "DB_USERNAME"] DB_USERNAME', $DB_USERNAME);
$this->changeEnvironmentVariable('DB_USERNAME', $DB_USERNAME ?? root);
$DB_PASSWORD = $this->ask('Please enter database password?');
$this->comment($DB_PASSWORD);
$this->changeEnvironmentVariable('[KEY = "DB_PASSWORD"] DB_PASSWORD', $DB_PASSWORD);
$this->changeEnvironmentVariable('DB_PASSWORD', $DB_PASSWORD);
$this->info('We are done with application and database params, good job!');
@ -116,11 +116,11 @@ class BagistoInstall extends Command
$MAIL_USERNAME = $this->ask('[KEY = "MAIL_USERNAME"] Enter MAIL_USERNAME?');
$this->comment($MAIL_USERNAME ?? null);
$this->changeEnvironmentVariable('MAIL_USERNAME', $MAIL_USERNAME);
$this->changeEnvironmentVariable('MAIL_USERNAME', $MAIL_USERNAME ?? null);
$MAIL_PASSWORD = $this->ask('[KEY = "MAIL_PASSWORD"] Enter MAIL_PASSWORD?');
$this->comment($MAIL_PASSWORD ?? null);
$this->changeEnvironmentVariable('MAIL_PASSWORD', $MAIL_PASSWORD);
$this->changeEnvironmentVariable('MAIL_PASSWORD', $MAIL_PASSWORD ?? null);
$MAIL_ENCRYPTION = $this->ask('[KEY = "MAIL_ENCRYPTION"] Enter MAIL_ENCRYPTION (default = tls)?');
$this->comment($MAIL_ENCRYPTION ?? 'tls');
@ -128,18 +128,18 @@ class BagistoInstall extends Command
$SHOP_MAIL_FROM = $this->ask('[KEY = "SHOP_MAIL_FROM"] Enter SHOP_MAIL_FROM?');
$this->comment($SHOP_MAIL_FROM ?? null);
$this->changeEnvironmentVariable('SHOP_MAIL_FROM', $SHOP_MAIL_FROM);
$this->changeEnvironmentVariable('SHOP_MAIL_FROM', $SHOP_MAIL_FROM ?? null);
$ADMIN_MAIL_TO = $this->ask('[KEY = "ADMIN_MAIL_TO"] Enter ADMIN_MAIL_TO?');
$this->comment($ADMIN_MAIL_TO ?? null);
$this->changeEnvironmentVariable('ADMIN_MAIL_TO', $ADMIN_MAIL_TO);
$this->changeEnvironmentVariable('ADMIN_MAIL_TO', $ADMIN_MAIL_TO ?? null);
$this->info('We are done setting all the configuration in the env file, now we will proceed by running the commands necessary for Bagisto');
\Artisan::call('config:cache');
$this->line('We are done setting all the configuration in the env file, now we will proceed by running the commands necessary for Bagisto');
$this->info('Running migrations...');
\Artisan::call('key:generate');
\Artisan::call('migrate');
$this->info('Migration completed.');
@ -160,13 +160,16 @@ class BagistoInstall extends Command
$this->info('Installation completed.');
$this->info('Please write us: SUPPORT@BAGISTO.COM');
$this->Line('Please write us: SUPPORT@BAGISTO.COM');
$this->info('Thank you!!!');
$this->Line('Thank you!!!');
}
public static function changeEnvironmentVariable($key, $value)
{
\Artisan::call('config:cache');
$path = base_path('.env');
if (file_exists($path)) {
@ -177,5 +180,7 @@ class BagistoInstall extends Command
file_get_contents($path)
));
}
\Artisan::call('config:cache');
}
}

2
packages/Webkul/Admin/src/Resources/views/sales/invoices/view.blade.php
View File

@ -280,7 +280,7 @@
<tr>
<td>{{ __('admin::app.sales.orders.discount') }}</td>
<td>-</td>
<td>-{{ core()->formatBasePrice($invoice->base_discount_amount) }}</td>
<td>{{ core()->formatBasePrice($invoice->base_discount_amount) }}</td>
</tr>
@endif

2
packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php
View File

@ -312,7 +312,7 @@
<tr>
<td>{{ __('admin::app.sales.orders.discount') }}</td>
<td>-</td>
<td>-{{ core()->formatBasePrice($order->base_discount_amount) }}</td>
<td>{{ core()->formatBasePrice($order->base_discount_amount) }}</td>
</tr>
@endif

4
packages/Webkul/Discount/src/Helpers/Cart/ConvertXToProductId.php
View File

@ -126,7 +126,7 @@ class ConvertXToProductId
foreach ($attributeOptions as $attributeOption) {
$selectedOptions = $attributeOption->value;
if ($attributeOption->type == 'select' || $attributeOption->type == 'multiselect') {
if (isset($attributeOption->type) && ($attributeOption->type == 'select' || $attributeOption->type == 'multiselect')) {
$attribute = $this->attribute->findWhere([
'code' => $attributeOption->attribute
]);
@ -164,6 +164,8 @@ class ConvertXToProductId
$selectedAttributeValues = collect();
$foundProducts = collect();
if ($attributeOption->attribute == 'sku') {
$testValue = $attributeOption->value;
$testCondition = $attributeOption->condition;

6
packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php
View File

@ -175,7 +175,9 @@ class CartRuleController extends Controller
// unset labels
unset($data['label']);
while (gettype($attribute_conditions) == 'string') {
$attribute_conditions = json_decode($attribute_conditions);
}
if (! isset($attribute_conditions) || ! (count($attribute_conditions->categories) || count($attribute_conditions->attributes))) {
$data['uses_attribute_conditions'] = 0;
@ -405,6 +407,10 @@ class CartRuleController extends Controller
// prepare actions from data for json action
$attribute_conditions = json_decode($attribute_conditions);
while (gettype($attribute_conditions) == 'string') {
$attribute_conditions = json_decode($attribute_conditions);
}
if (! isset($attribute_conditions) || ! (count($attribute_conditions->categories) || count($attribute_conditions->attributes))) {
$data['uses_attribute_conditions'] = 0;

1
packages/Webkul/Shop/src/Resources/assets/js/app.js vendored
View File

@ -14,7 +14,6 @@ Vue.component("image-slider", require("./components/image-slider.vue"));
Vue.component("vue-slider", require("vue-slider-component"));
$(document).ready(function () {
const app = new Vue({
el: "#app",

4
packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php
View File

@ -25,13 +25,13 @@
@endif
<div class="item-detail" id="discount-detail" @if ($cart->discount_amount && $cart->discount_amount > 0) style="display: block;" @else style="display: none;" @endif>
<div class="item-detail" id="discount-detail" @if ($cart->base_discount_amount && $cart->base_discount_amount > 0) style="display: block;" @else style="display: none;" @endif>
<label>
<b>{{ __('shop::app.checkout.total.disc-amount') }}</b>
</label>
<label class="right">
<b id="discount-detail-discount-amount">
{{ core()->currency($cart->discount_amount) }}
{{ core()->currency($cart->base_discount_amount) }}
</b>
</label>
</div>