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:
Prashant Singh 2019-02-28 10:17:20 +05:30
parent 1ac6496fbc 674639a008
commit 96dc1bd28c
12 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php
View File

@ -35,7 +35,7 @@ class OrderShipmentsDataGrid extends DataGrid
$this->addFilter('inventory_source_name', 'is.name');
$this->addFilter('orderdate', 'ors.created_at');
$this->addFilter('shipment_created_at', 'shipments.created_at');
$this->addFilter('shipped_to', DDB::raw('CONCAT(order_address_shipping.first_name, " ", order_address_shipping.last_name) as shipped_to'));
$this->addFilter('shipped_to', DB::raw('CONCAT(order_address_shipping.first_name, " ", order_address_shipping.last_name) as shipped_to'));
$this->setQueryBuilder($queryBuilder);
}

2
packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php
View File

@ -6,7 +6,7 @@
@section('content')
<div class="content">
<form method="POST" action="{{ route('admin.catalog.attributes.store') }}" @submit.prevent="onSubmit">
<form method="POST" action="{{ route('admin.catalog.attributes.store') }}" @submit.prevent="onSubmit" enctype="multipart/form-data">
<div class="page-header">
<div class="page-title">

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

@ -321,7 +321,7 @@
<swatch-picker :input-name="'options[' + row.id + '][swatch_value]'" :color="row.swatch_value" colors="text-advanced" show-fallback />
</td>
<td v-if="show_swatch && swatch_type == 'image'">
<td style="white-space: nowrap;" v-if="show_swatch && swatch_type == 'image'">
<img style="width: 36px;height: 36px;vertical-align: middle;background: #F2F2F2;border-radius: 2px;margin-right: 10px;" v-if="row.swatch_value_url" :src="row.swatch_value_url"/>
<input type="file" accept="image/*" :name="'options[' + row.id + '][swatch_value]'"/>
</td>

2
packages/Webkul/Shop/src/Resources/assets/sass/app.scss vendored
View File

@ -2082,7 +2082,7 @@ section.product-detail {
}
.reviewer-details {
color: $font-color-light;
color: #5e5e5e;
}
}

2
packages/Webkul/Shop/src/Resources/views/products/reviews/index.blade.php
View File

@ -120,7 +120,7 @@
</span>
<span class="when">
{{ core()->formatDate($review->created_at) }}
{{ core()->formatDate($review->created_at, 'F d, Y') }}
</span>
</div>
</div>

2
packages/Webkul/Shop/src/Resources/views/products/view/reviews.blade.php
View File

@ -63,7 +63,7 @@
</span>
<span class="when">
{{ core()->formatDate($review->created_at) }}
{{ core()->formatDate($review->created_at, 'F d, Y') }}
</span>
</div>
</div>

2
packages/Webkul/Ui/publishable/assets/js/ui.js vendored
View File

File diff suppressed because one or more lines are too long

4
packages/Webkul/Ui/publishable/assets/mix-manifest.json
View File

@ -1,4 +1,4 @@
{
"/js/ui.js": "/js/ui.js?id=5651254246f8f1dab65e",
"/js/ui.js": "/js/ui.js?id=0219a3829322d1811a09",
"/css/ui.css": "/css/ui.css?id=1b4c4dfa67b7cfac4822"
}
}

4
packages/Webkul/Ui/src/Resources/assets/js/app.js vendored
View File

@ -18,4 +18,6 @@ Vue.component("datetime", require("./components/datetime"));
Vue.component("date", require("./components/date"));
Vue.component("swatch-picker", require("./components/swatch-picker"));
require('flatpickr/dist/flatpickr.css');
require('flatpickr/dist/flatpickr.css');
require('vue-swatches/dist/vue-swatches.min.css');

3
packages/Webkul/Ui/src/Resources/assets/js/components/swatch-picker.vue
View File

@ -6,8 +6,7 @@
</template>
<script>
import "vue-swatches/dist/vue-swatches.min.css"
import Swatches from 'vue-swatches'
import Swatches from 'vue-swatches';
export default {
components: { Swatches },

7
public/installer/index.php
View File

@ -16,7 +16,7 @@
// converting env content to key/value pair
$data = explode(PHP_EOL,$str);
$databaseArray = ['DB_HOST', 'DB_DATABASE', 'DB_USERNAME', 'DB_PASSWORD', 'DB_CONNECTION'];
$databaseArray = ['DB_HOST', 'DB_DATABASE', 'DB_USERNAME', 'DB_PASSWORD', 'DB_CONNECTION','DB_PORT'];
$key = $value = [];
if ($data) {
@ -39,9 +39,10 @@
$password = $databaseData['DB_PASSWORD'];
$dbname = $databaseData['DB_DATABASE'];
$connection = $databaseData['DB_CONNECTION'];
$port = $databaseData['DB_PORT'];
if ($connection == 'mysql') {
@$conn = new mysqli($servername, $username, $password, $dbname);
@$conn = new mysqli($servername, $username, $password, $dbname, $port);
if (!$conn->connect_error) {
// retrieving admin entry
@ -98,4 +99,4 @@
// redirecting to 404 error page
header("Location: $url");
}
?>
?>

5
public/installer/install.php
View File

@ -15,7 +15,7 @@
// converting env content to key/value pair
$data = explode(PHP_EOL,$str);
$databaseArray = ['DB_HOST', 'DB_DATABASE', 'DB_USERNAME', 'DB_PASSWORD', 'DB_CONNECTION'];
$databaseArray = ['DB_HOST', 'DB_DATABASE', 'DB_USERNAME', 'DB_PASSWORD', 'DB_CONNECTION','DB_PORT'];
$key = $value = [];
if ($data) {
@ -38,9 +38,10 @@
$password = $databaseData['DB_PASSWORD'];
$dbname = $databaseData['DB_DATABASE'];
$connection = $databaseData['DB_CONNECTION'];
$port = $databaseData['DB_PORT'];
if ($connection == 'mysql') {
@$conn = new mysqli($servername, $username, $password, $dbname);
@$conn = new mysqli($servername, $username, $password, $dbname, $port);
if (!$conn->connect_error) {
// retrieving admin entry