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

Bug fix

This commit is contained in:
Prashant Singh 2019-03-19 16:19:41 +05:30
parent 7ad8d567b1
commit b59c25bfb8
4 changed files with 7 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/Webkul/Checkout/src/Cart.php
View File

@ -841,10 +841,10 @@ class Cart {
} else if ($item->product->name != $item->name) {
$item->update(['name' => $item->product->name]);
} else if($this->price->getMinimalPrice($item->child->product) != $item->price) {
} else if ($this->price->getMinimalPrice($item->child->product) != $item->price) {
// $price = (float) $item->custom_price ? $item->custom_price : $item->child->product->price;
if((float)$item->custom_price) {
if ((float)$item->custom_price) {
$price = $item->custom_price;
} else {
$price = $this->price->getMinimalPrice($item->child->product);
@ -868,10 +868,10 @@ class Cart {
} else if ($this->price->getMinimalPrice($item->product) != $item->price) {
// $price = (float) $item->custom_price ? $item->custom_price : $item->product->price;
if((float)$item->custom_price) {
if ((float)$item->custom_price) {
$price = $item->custom_price;
} else {
$price = $this->price->getMinimalPrice($item->child->product);
$price = $this->price->getMinimalPrice($item->product);
}
$item->update([

2
packages/Webkul/User/src/Http/Middleware/Bouncer.php
View File

@ -29,6 +29,8 @@ class Bouncer
public function checkIfAuthorized($request)
{
// dd(auth()->guard('admin')->user()->role);
if (! $role = auth()->guard('admin')->user()->role)
abort(401, 'This action is unauthorized.');

1
public/installer/install.php
View File

@ -21,6 +21,7 @@
if ($data) {
foreach ($data as $line) {
$rowValues = explode('=', $line);
if (count($rowValues) === 2) {
if (in_array($rowValues[0], $databaseArray)) {
$key[] = $rowValues[0];

95
resources/views/welcome.blade.php
View File

@ -1,95 +0,0 @@
<!doctype html>
<html lang="{{ app()->getLocale() }}">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Laravel</title>
<!-- Fonts -->
<link href="https://fonts.googleapis.com/css?family=Raleway:100,600" rel="stylesheet" type="text/css">
<!-- Styles -->
<style>
html, body {
background-color: #fff;
color: #636b6f;
font-family: 'Raleway', sans-serif;
font-weight: 100;
height: 100vh;
margin: 0;
}
.full-height {
height: 100vh;
}
.flex-center {
align-items: center;
display: flex;
justify-content: center;
}
.position-ref {
position: relative;
}
.top-right {
position: absolute;
right: 10px;
top: 18px;
}
.content {
text-align: center;
}
.title {
font-size: 84px;
}
.links > a {
color: #636b6f;
padding: 0 25px;
font-size: 12px;
font-weight: 600;
letter-spacing: .1rem;
text-decoration: none;
text-transform: uppercase;
}
.m-b-md {
margin-bottom: 30px;
}
</style>
</head>
<body>
<div class="flex-center position-ref full-height">
@if (Route::has('login'))
<div class="top-right links">
@auth
<a href="{{ url('/home') }}">Home</a>
@else
<a href="{{ route('login') }}">Login</a>
<a href="{{ route('register') }}">Register</a>
@endauthexample-component
</div>
@endif
<div class="content">
<div class="title m-b-md">
Laravel
</div>
<div class="links">
<a href="https://laravel.com/docs">Documentation</a>
<a href="https://laracasts.com">Laracasts</a>
<a href="https://laravel-news.com">News</a>
<a href="https://forge.laravel.com">Forge</a>
<a href="https://github.com/laravel/laravel">GitHub</a>
</div>
</div>
</div>
</body>
</html>