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

Merge pull request #1440 from prashant-webkul/development 

Fixed a translation typo in create cart rule form
This commit is contained in:
Jitendra Singh 2019-09-11 13:57:35 +05:30 committed by GitHub
parent 7c9d8a06ed e6104668e0
commit 3cd49daa5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,6 +85,8 @@ class BagistoInstall extends Command
$this->changeEnvironmentVariable('DB_DATABASE', $DB_DATABASE);
$DB_USERNAME = null;
while(! isset($DB_USERNAME)) {
$DB_USERNAME = $this->ask('Enter database username?');
$this->comment($DB_USERNAME ?? 'root');

2
packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php
View File

@ -208,7 +208,7 @@
<div v-if='conditions_list[index].attribute == "shipping_country"'>
<select class="control" v-model="conditions_list[index].value">
<option disabled="disabled">{{ __('admin::app.select-option']) }}</option>
<option disabled="disabled">{{ __('admin::app.select-option') }}</option>
<option v-for="(country, index) in country_and_states.countries" :value="country.code">@{{ country.name }}</option>
</select>
</div>