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

merged with master

This commit is contained in:
Prashant Singh 2019-02-13 11:40:56 +05:30
parent 5ea84dff76 468004eb8b
commit 616d1bf160
15 changed files with 42 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
composer.json
View File

@ -31,6 +31,7 @@
"fzaninotto/faker": "^1.4",
"mockery/mockery": "^1.0",
"nunomaduro/collision": "^2.0",
"phploc/phploc": "^5.0@dev",
"phpunit/phpunit": "^7.0"
},
"replace": {

2
packages/Webkul/Admin/publishable/assets/js/admin.js vendored
View File

File diff suppressed because one or more lines are too long

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

@ -1,4 +1,4 @@
{
"/js/admin.js": "/js/admin.js?id=7683c8f127f6ad2ac3ce",
"/js/admin.js": "/js/admin.js?id=da5ebef9c25a064e7ed6",
"/css/admin.css": "/css/admin.css?id=ccc39419fee98ed8ac7b"
}
}

2
packages/Webkul/Shop/publishable/assets/css/shop.css vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Shop/publishable/assets/mix-manifest.json
View File

@ -1,4 +1,4 @@
{
"/js/shop.js": "/js/shop.js?id=0076f480705e7ce1f8e0",
"/css/shop.css": "/css/shop.css?id=69d51d46b4e6507c42ab"
"/css/shop.css": "/css/shop.css?id=23e535f35bb6c1e6b9d2"
}

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

@ -3052,6 +3052,7 @@ section.review {
border-bottom: 1px solid $border-color;
border-top: 1px solid $border-color;
height: 50px;
margin-top: 10px;
.account-action {
margin-top: 12px;

6
packages/Webkul/Ui/publishable/assets/css/ui.css vendored
View File

File diff suppressed because one or more lines are too long

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=d984bc35663c0fd9cf3f",
"/css/ui.css": "/css/ui.css?id=3e30fa4906ea972abd50"
"/js/ui.js": "/js/ui.js?id=8f9e12057b68b45d7046",
"/css/ui.css": "/css/ui.css?id=e4a0efc923ed917eb606"
}

9
packages/Webkul/Ui/src/Resources/assets/sass/app.scss vendored
View File

@ -813,6 +813,15 @@ modal {
}
}
// responsive css for model
@media only screen and (max-width: 770px){
.modal-container {
max-width: 80%;
left: 10%;
margin-left: 0px;
}
}
.label {
background: #E7E7E7;
@include border-radius(2px);

12
packages/Webkul/Ui/src/Resources/views/datagrid/body.blade.php
View File

@ -21,25 +21,25 @@
@if (isset($column['wrapper']))
@if (isset($column['closure']) && $column['closure'] == true)
<td>{!! $column['wrapper']($record) !!}</td>
<td data-value="{{ $column['label'] }}">{!! $column['wrapper']($record) !!}</td>
@else
<td>{{ $column['wrapper']($record) }}</td>
<td data-value="{{ $column['label'] }}">{{ $column['wrapper']($record) }}</td>
@endif
@else
@if($column['type'] == 'price')
@if(isset($column['currencyCode']))
<td>{{ core()->formatPrice($record->{$columnIndex}, $column['currencyCode']) }}</td>
<td data-value="{{ $column['label'] }}">{{ core()->formatPrice($record->{$columnIndex}, $column['currencyCode']) }}</td>
@else
<td>{{ core()->formatBasePrice($record->{$columnIndex}) }}</td>
<td data-value="{{ $column['label'] }}">{{ core()->formatBasePrice($record->{$columnIndex}) }}</td>
@endif
@else
<td>{{ $record->{$columnIndex} }}</td>
<td data-value="{{ $column['label'] }}">{{ $record->{$columnIndex} }}</td>
@endif
@endif
@endforeach
@if ($enableActions)
<td class="actions" style="width: 100px;">
<td class="actions" style="width: 100px;" data-value=" {{ __('ui::app.datagrid.actions') }}">
<div>
@foreach ($actions as $action)
<a href="{{ route($action['route'], $record->{$index}) }}">

1
public/installer/AdminConfig.php
View File

@ -47,6 +47,7 @@ $data = array();
$data = explode(PHP_EOL,$str);
$databaseArray = ['DB_HOST', 'DB_DATABASE', 'DB_USERNAME', 'DB_PASSWORD', 'DB_CONNECTION'];
$key = $value = [];
if ($data) {
foreach ($data as $line) {
$rowValues = explode('=', $line);

20
public/installer/Migration.php
View File

@ -69,12 +69,12 @@
<div class="content" id="migration-result">
<div class="window" id="migrate">
</div>
<div class="window" id="key">
</div>
<div class="window" id="seed">
</div>
<div class="window" id="publish">
</div>
<div class="window" id="storage">
</div>
<div class="window" id="composer">
</div>
@ -194,11 +194,11 @@
if (data['publish']) {
$('#publish').append('<div class="terminal">' + data['publish'] + '</div>');
}
if (data['storage']) {
$('#storage').append('<div class="terminal">' + data['storage'] + '</div>');
if (data['key']) {
$('#key').append('<div class="terminal">' + data['key'] + '</div>');
}
if ((data['key_results'] == 0) && (data['seeder_results'] == 0) && (data['publish_results'] == 0) && (data['storage_results'] == 0)) {
if ((data['key_results'] == 0) && (data['seeder_results'] == 0) && (data['publish_results'] == 0)) {
$('#continue').show();
$('#migrate-seed').hide();
$('#loader').hide();
@ -207,6 +207,7 @@
} else {
$('#migrate').show();
$('#loader').hide();
$('#migrate-seed').show();
$('#migration-back').show();
if (data['migrate']) {
@ -231,11 +232,4 @@
});
});
</script>
</script>

4
public/installer/Seeder.php
View File

@ -1,17 +1,15 @@
<?php
// array to pass back data
$data = array();
$data = array();
// run command on terminal
$key = 'cd ../.. && php artisan key:generate 2>&1';
$seeder = 'cd ../.. && php artisan db:seed 2>&1';
$storage = 'cd ../.. && php artisan storage:link 2>&1';
$publish = 'cd ../.. && php artisan vendor:publish 2>&1';
$key_output = exec($key, $data['key'], $data['key_results']);
$seeder_output = exec($seeder, $data['seeder'], $data['seeder_results']);
$storage_output = exec($storage, $data['storage'], $data['storage_results']);
$publish = exec($publish, $data['publish'], $data['publish_results']);
// return a response

3
public/installer/index.php
View File

@ -18,6 +18,7 @@
$data = explode(PHP_EOL,$str);
$databaseArray = ['DB_HOST', 'DB_DATABASE', 'DB_USERNAME', 'DB_PASSWORD', 'DB_CONNECTION'];
$key = $value = [];
if ($data) {
foreach ($data as $line) {
$rowValues = explode('=', $line);
@ -82,6 +83,8 @@
echo $requirement->render();
echo $permission->render();
echo $welcome->render();
$storage_output = exec('cd ../.. && php artisan storage:link 2>&1');
} else {
// getting url
$actual_link = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on' ? "https" : "http") . "://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]";