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

composer for installer

This commit is contained in:
rahul shukla 2019-01-22 16:13:56 +05:30
parent afce42bf0c
commit a269dc614f
7 changed files with 35727 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

31702
packages/Webkul/Shop/publishable/assets/js/shop.js vendored
View File

File diff suppressed because one or more lines are too long

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

@ -1,4 +1,4 @@
{
"/js/shop.js": "/js/shop.js?id=dc2ea56a854d779e7089",
"/css/shop.css": "/css/shop.css?id=7a0ee09c1b127c0490e0"
}
"/js/shop.js": "/js/shop.js",
"/css/shop.css": "/css/shop.css"
}

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

@ -3257,6 +3257,49 @@ section.review {
}
.right-content {
.currency-account li {
display: inline;
border-right: 2px solid #C7C7C7;
cursor: pointer;
.account-icon {
position: relative;
top: 8px;
margin-left: 12px;
}
.cart-icon {
position: relative;
top: 7px;
margin-left: 12px;
}
.arrow-down-icon {
margin-right: 15px;
}
ul.dropdown-list {
display: block;
margin-top: 14px;
width: 100px;
.currency {
color: red;
}
li {
border-right: none;
padding: 5px 10px 5px 10px;
display: block;
}
}
}
}
/// rtl css start here
.rtl {
direction: rtl;

37
packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php
View File

@ -28,6 +28,40 @@
</ul>
</div>
<div class="right-content">
<ul class="currency-account">
<li>
<span>
{{ core()->getCurrentCurrencyCode() }}
<i class="icon arrow-down-icon active"></i>
</span>
<ul class="dropdown-list currency">
@foreach (core()->getCurrentChannel()->currencies as $currency)
<li>
<a href="?currency={{ $currency->code }}">{{ $currency->code }}</a>
</li>
@endforeach
</ul>
</li>
<li>
<i class="icon account-icon"></i>
<i class="icon arrow-down-icon active"></i>
</li>
<li>
@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
<span class="icon cart-icon"></span>
</li>
</ul>
</div>
<div class="right-content">
@if (core()->getCurrentChannel()->currencies->count() > 1)
<ul class="currency-switcher">
@ -193,6 +227,7 @@
</div>
</div>
@push('scripts')
<script>
$(document).ready(function() {
@ -231,4 +266,4 @@
}
});
</script>
@endpush
@endpush

3
public/installer/Classes/Requirement.php
View File

@ -123,8 +123,7 @@ class Requirement {
*/
private static function composerInstall()
{
putenv('COMPOSER_HOME=' . __DIR__ . '/vendor/bin/composer');
$command = 'composer --version 2>&1';
$command = 'cd ../.. ; export HOME=/root && export COMPOSER_HOME=/root && /usr/bin/composer.phar self-update; composer --version';
exec($command, $data['composer'], $data['composer_install']);
return $data['composer_install'];

7
public/installer/Composer.php
View File

@ -4,12 +4,9 @@ $data = array(); // array to pass back data
// run command on terminal ===========================================================
// composer home for run
putenv('COMPOSER_HOME=' . __DIR__ . '/vendor/bin/composer');
$command = 'cd ../.. ; export HOME=/root && export COMPOSER_HOME=/root && /usr/bin/composer.phar self-update; composer install 2>&1';
$command = 'cd ../.. && composer install 2>&1';
$last_line = exec($command, $data['composer'], $data['install']);
$last_line = exec($command, $data['composer'], $data['install']);
// return a response ===========================================================