Browse Source

Change theme to regular bootstrap with custom css

Update transaction draft row item form
Update session and app config files
pull/3/head
Nafies Luthfi 9 years ago
parent
commit
88191ea4f7
  1. 15
      app/Helpers/helpers.php
  2. 20
      composer.lock
  3. 2
      config/app.php
  4. 2
      config/session.php
  5. 26
      public/css/app.custom.css
  6. 6
      public/css/plugins/bootstrap-theme.min.css
  7. 6
      public/css/plugins/bootstrap.min.css
  8. 7
      public/js/plugins/bootstrap.min.js
  9. 4
      public/js/plugins/jquery.min.js
  10. 20
      resources/views/auth/login.blade.php
  11. 2
      resources/views/cart/index.blade.php
  12. 16
      resources/views/cart/partials/draft-item-list.blade.php
  13. 6
      resources/views/cart/partials/product-search-box.blade.php
  14. 79
      resources/views/layouts/app.blade.php
  15. 54
      resources/views/layouts/partials/top-nav.blade.php

15
app/Helpers/helpers.php

@ -13,3 +13,18 @@ function formatRp($number)
return 'Rp. '.formatNo($number);
}
/**
* Overide Laravel Collective link_to_route helper function
* @param string $name Name of route
* @param string $title Text that displayed on view
* @param array $parameters URL Parameter
* @param array $attributes The anchor tag atributes
*/
function html_link_to_route($name, $title = null, $parameters = [], $attributes = [])
{
if (array_key_exists('icon', $attributes))
$title = '<i class="fa fa-' . $attributes['icon'] . '"></i> ' . $title;
return app('html')->decode(link_to_route($name, $title, $parameters, $attributes));
}

20
composer.lock

@ -430,16 +430,16 @@
},
{
"name": "luthfi/formfield",
"version": "0.1.3",
"version": "0.1.4",
"source": {
"type": "git",
"url": "https://github.com/nafiesl/FormField.git",
"reference": "2f6222d1f72562d102811bc5a0e584b4b78f86b6"
"reference": "bcacbdcf7289099e90adec803d28c44bf67a3fd4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nafiesl/FormField/zipball/2f6222d1f72562d102811bc5a0e584b4b78f86b6",
"reference": "2f6222d1f72562d102811bc5a0e584b4b78f86b6",
"url": "https://api.github.com/repos/nafiesl/FormField/zipball/bcacbdcf7289099e90adec803d28c44bf67a3fd4",
"reference": "bcacbdcf7289099e90adec803d28c44bf67a3fd4",
"shasum": ""
},
"require": {
@ -466,7 +466,7 @@
}
],
"description": "Form Field helper class for Laravel 5.3 with Twitter Bootstrap",
"time": "2017-04-19T04:09:24+00:00"
"time": "2017-04-22T13:49:25+00:00"
},
{
"name": "monolog/monolog",
@ -822,16 +822,16 @@
},
{
"name": "swiftmailer/swiftmailer",
"version": "v5.4.6",
"version": "v5.4.7",
"source": {
"type": "git",
"url": "https://github.com/swiftmailer/swiftmailer.git",
"reference": "81fdccfaf8bdc5d5d7a1ef6bb3a61bbb1a6c4a3e"
"reference": "56db4ed32a6d5c9824c3ecc1d2e538f663f47eb4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/81fdccfaf8bdc5d5d7a1ef6bb3a61bbb1a6c4a3e",
"reference": "81fdccfaf8bdc5d5d7a1ef6bb3a61bbb1a6c4a3e",
"url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/56db4ed32a6d5c9824c3ecc1d2e538f663f47eb4",
"reference": "56db4ed32a6d5c9824c3ecc1d2e538f663f47eb4",
"shasum": ""
},
"require": {
@ -872,7 +872,7 @@
"mail",
"mailer"
],
"time": "2017-02-13T07:52:53+00:00"
"time": "2017-04-20T17:32:18+00:00"
},
{
"name": "symfony/console",

2
config/app.php

@ -64,7 +64,7 @@ return [
|
*/
'timezone' => 'Asia/Jakarta',
'timezone' => 'Asia/Makassar',
/*
|--------------------------------------------------------------------------

2
config/session.php

@ -122,7 +122,7 @@ return [
|
*/
'cookie' => 'laravel_session',
'cookie' => 'grosir_obat',
/*
|--------------------------------------------------------------------------

26
public/css/app.custom.css

@ -0,0 +1,26 @@
/* Body */
body { font-family: "Trebuchet MS", serif; }
/* End of Body */
/* Typography */
.strong { font-weight: bold; }
/* End of Typography */
/* Navtabs */
.nav-tabs>li>a { padding: 6px 10px; border-color: #eee #eee #ddd; }
.transaction-draft-tabs { border-bottom: 0; }
/* End of Navtabs */
/* Layout */
.page-header { margin-top: 0px; }
h3.page-header { padding-bottom: 15px; }
div.notifier { z-index: 100; position: absolute; top: 30px; left: 50%; transform: translate(-50%,-50%); }
/* End of Layout */
/* Form */
.form-group.required .control-label { position: relative; }
.form-group.required .control-label:after { content: "*"; color: red; font-size: 16px; position: absolute; top: -4px; right: -9px; }
.show-on-hover { display: none; }
.show-on-hover-parent:hover .show-on-hover { display: inline; }
/* End of Form */

6
public/css/plugins/bootstrap-theme.min.css
File diff suppressed because it is too large
View File

6
public/css/plugins/bootstrap.min.css
File diff suppressed because it is too large
View File

7
public/js/plugins/bootstrap.min.js
File diff suppressed because it is too large
View File

4
public/js/plugins/jquery.min.js
File diff suppressed because it is too large
View File

20
resources/views/auth/login.blade.php

@ -1,9 +1,11 @@
@extends('layouts.app')
@section('title', 'Login')
@section('content')
<div class="container">
<div class="row">
<div class="col-md-8 col-md-offset-2">
<div class="col-md-4 col-md-offset-4">
<div class="panel panel-default">
<div class="panel-heading">Login</div>
<div class="panel-body">
@ -13,7 +15,7 @@
<div class="form-group{{ $errors->has('username') ? ' has-error' : '' }}">
<label for="username" class="col-md-4 control-label">Username</label>
<div class="col-md-6">
<div class="col-md-8">
<input id="username" type="text" class="form-control" name="username" value="{{ old('username') }}" required autofocus>
@if ($errors->has('username'))
<span class="help-block">
@ -26,7 +28,7 @@
<div class="form-group{{ $errors->has('password') ? ' has-error' : '' }}">
<label for="password" class="col-md-4 control-label">Password</label>
<div class="col-md-6">
<div class="col-md-8">
<input id="password" type="password" class="form-control" name="password" required>
@if ($errors->has('password'))
@ -38,18 +40,8 @@
</div>
<div class="form-group">
<div class="col-md-6 col-md-offset-4">
<div class="checkbox">
<label>
<input type="checkbox" name="remember" {{ old('remember') ? 'checked' : '' }}> Remember Me
</label>
</div>
</div>
</div>
<div class="form-group">
<div class="col-md-8 col-md-offset-4">
<button type="submit" class="btn btn-primary">
<button type="submit" class="btn btn-primary btn-block">
Login
</button>
</div>

2
resources/views/cart/index.blade.php

@ -1,5 +1,7 @@
@extends('layouts.app')
@section('title', 'Entry Transaksi')
@section('content')
<?php use Facades\App\Cart\CartCollection; ?>

16
resources/views/cart/partials/draft-item-list.blade.php

@ -18,29 +18,23 @@
<td>{{ $key + 1 }}</td>
<td>{{ $item->name }}</td>
<td>{{ formatRp($item->price) }}</td>
<td>
{{ Form::open(['route' => ['cart.update-draft-item', $draft->draftKey], 'method' => 'patch']) }}
{{ Form::hidden('item_key', $key) }}
{{ Form::hidden('qty', $item->qty) }}
<td>
{{ Form::text('item_discount', $item->item_discount, ['id' => 'item_discount-' . $key, 'style' => 'width:100px;text-align:right']) }}
{{ Form::submit('update-item-' . $key, ['style'=>'display:none']) }}
{{ Form::close() }}
</td>
<td>
{{ Form::open(['route' => ['cart.update-draft-item', $draft->draftKey], 'method' => 'patch']) }}
{{ Form::hidden('item_key', $key) }}
{{ Form::hidden('item_discount', $item->item_discount) }}
{{ Form::number('qty', $item->qty, ['id' => 'qty-' . $key, 'style' => 'width:50px;text-align:center']) }}
{{ Form::submit('update-item-' . $key, ['style'=>'display:none']) }}
{{ Form::close() }}
</td>
<td class="text-right">{{ formatRp($item->subtotal) }}</td>
<td class="text-center">
{{ Form::submit('update-item-' . $key, ['style'=>'display:none']) }}
{{ Form::close() }}
<td class="text-center show-on-hover-parent">
{!! FormField::delete([
'route' => ['cart.remove-draft-item', $draft->draftKey],
'onsubmit' => 'Yakin ingin menghapus Item ini?',
'class' => '',
], 'x', ['id' => 'remove-item-' . $key, 'class' => 'btn btn-danger btn-xs'], ['item_index' => $key]) !!}
], 'x', ['id' => 'remove-item-' . $key, 'class' => 'btn btn-danger btn-xs show-on-hover','title' => 'Hapus item ini'], ['item_index' => $key]) !!}
</td>
</tr>
@empty

6
resources/views/cart/partials/product-search-box.blade.php

@ -1,10 +1,10 @@
<div class="panel panel-default">
<div class="panel panel-default" style="border-radius:0px">
<div class="panel-heading">
<form method="get" action="{{ route('cart.show', $draft->draftKey) }}">
<label for="query">{{ trans('cart.product_search') }}</label>
<input type="text" id="query" name="query" value="{{ request('query') }}">
<input type="submit" value="{{ trans('cart.product_search') }}" class="btn btn-info btn-sm">
<a href="{{ route('cart.show', $draft->draftKey) }}" class="btn btn-default btn-sm">Refresh</a>
<input type="submit" value="{{ trans('cart.product_search') }}" class="btn btn-sm">
<a href="{{ route('cart.show', $draft->draftKey) }}" class="btn btn-sm">Refresh</a>
</form>
</div>
@includeWhen ($queriedProducts, 'cart.partials.product-search-result-box')

79
resources/views/layouts/app.blade.php

@ -8,82 +8,35 @@
<!-- CSRF Token -->
<meta name="csrf-token" content="{{ csrf_token() }}">
<title>{{ config('app.name', 'Laravel') }}</title>
<title>@yield('title') | {{ config('app.name', 'Laravel') }}</title>
<!-- Styles -->
<link href="{{ asset('css/app.css') }}" rel="stylesheet">
{{ Html::style(url('css/plugins/bootstrap.min.css')) }}
{{ Html::style('css/plugins/bootstrap-theme.min.css') }}
@yield('ext_css')
{{ Html::style(url('css/app.custom.css')) }}
<!-- Scripts -->
<script>
window.Laravel = {!! json_encode([
window.Laravel = <?php echo json_encode([
'csrfToken' => csrf_token(),
]) !!};
]); ?>
</script>
</head>
<body>
<div id="app">
<nav class="navbar navbar-default navbar-static-top">
<div class="container">
<div class="navbar-header">
<!-- Collapsed Hamburger -->
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#app-navbar-collapse">
<span class="sr-only">Toggle Navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<!-- Branding Image -->
<a class="navbar-brand" href="{{ url('/') }}">
{{ config('app.name', 'Laravel') }}
</a>
</div>
<div class="collapse navbar-collapse" id="app-navbar-collapse">
<!-- Right Side Of Navbar -->
<ul class="nav navbar-nav navbar-right">
<!-- Authentication Links -->
@if (Auth::check())
<li>
<form class="" action="{{ route('cart.add') }}" method="POST">
{{ csrf_field() }}
<input type="submit" class="btn btn-default navbar-btn" name="create-cash-draft" id="cash-draft-create-button" value="{{ trans('transaction.create_cash') }}">
<input type="submit" class="btn btn-default navbar-btn" name="create-credit-draft" id="credit-draft-create-button" value="{{ trans('transaction.create_credit') }}">
</form>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
{{ Auth::user()->name }} <span class="caret"></span>
</a>
<ul class="dropdown-menu" role="menu">
<li>
<a href="{{ route('logout') }}"
onclick="event.preventDefault();
document.getElementById('logout-form').submit();">
Logout
</a>
<form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
{{ csrf_field() }}
<button type="submit" style="display: none;" id="logout-button" >Logout</button>
</form>
</li>
</ul>
</li>
@endif
</ul>
</div>
</div>
</nav>
@include('layouts.partials.top-nav')
<div class="container">
@yield('content')
</div>
{{-- @include('flash::message') --}}
</div>
<!-- Scripts -->
<script src="{{ asset('js/app.js') }}"></script>
{{ Html::script(url('js/plugins/jquery.min.js')) }}
{{ Html::script(url('js/plugins/bootstrap.min.js')) }}
@stack('ext_js')
<script>
$('div.notifier').not('.alert-important').delay(5000).fadeOut(350);
</script>
@yield('script')
</body>
</html>

54
resources/views/layouts/partials/top-nav.blade.php

@ -0,0 +1,54 @@
<nav class="navbar navbar-default navbar-static-top">
<div class="container">
<div class="navbar-header">
<!-- Collapsed Hamburger -->
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#app-navbar-collapse">
<span class="sr-only">Toggle Navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<!-- Branding Image -->
<a class="navbar-brand" href="{{ url('/') }}">
{{ config('app.name', 'Laravel') }}
</a>
</div>
<div class="collapse navbar-collapse" id="app-navbar-collapse">
<!-- Right Side Of Navbar -->
<ul class="nav navbar-nav navbar-right">
<!-- Authentication Links -->
@if (Auth::check())
<li>
<form class="" action="{{ route('cart.add') }}" method="POST">
{{ csrf_field() }}
<input type="submit" class="btn btn-default navbar-btn" name="create-cash-draft" id="cash-draft-create-button" value="{{ trans('transaction.create_cash') }}">
<input type="submit" class="btn btn-default navbar-btn" name="create-credit-draft" id="credit-draft-create-button" value="{{ trans('transaction.create_credit') }}">
</form>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
{{ Auth::user()->name }} <span class="caret"></span>
</a>
<ul class="dropdown-menu" role="menu">
<li>
<a href="{{ route('logout') }}"
onclick="event.preventDefault();
document.getElementById('logout-form').submit();">
Logout </a>
<form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
{{ csrf_field() }}
<button type="submit" style="display: none;" id="logout-button" >Logout</button>
</form>
</li>
</ul>
</li>
@endif
</ul>
</div>
</div>
</nav>
Loading…
Cancel
Save