resolved conflicts

docker/statistics/Modules/ClinicalData/Resources/views/sundries/inactive.blade.php

@@ -0,0 +1,93 @@
+@extends('layouts.main')
+
+@push('styles')
+<link href="{{ asset('/elite/bower_components/datatables/jquery.dataTables.min.css') }}" rel="stylesheet" type="text/css" />
+<link href="{{ asset('elite/tables/css/buttons.dataTables.min.css') }}" rel="stylesheet" type="text/css" />
+@endpush
+
+@section('content')
+<div class="row bg-title">
+    <div class="col-lg-3 col-md-4 col-sm-4 col-xs-12">
+        <h4 class="page-title">{{ __('sundries.activate_sundries') }}</h4>
+    </div>
+    <div class="col-lg-9 col-sm-8 col-md-8 col-xs-12">
+        <ol class="breadcrumb">
+            <li><a href="{{ route('home') }}">{{ __('sundries.dashboard') }}</a></li>
+            <li><a href="/sundries/index">{{ __('sundries.sundries') }}</a></li>
+            <li class="active">{{ __('sundries.activate') }}</li>
+        </ol>
+    </div>
+</div>
+
+<div class="row">
+    <div class="col-sm-12">
+        @include('clinical_data::sundries.menu')
+    </div>
+</div>
+
+<div class="row">
+    <div class="col-sm-12">
+        <div class="white-box">
+            <div class="table-responsive">
+                <table class="table table-striped">
+                    <thead>
+                        <tr>
+                            <th>{{ __('sundries.sundry_name') }}</th>
+                            <th>{{ __('sundries.buying_price') }}</th>
+                            <th>{{ __('sundries.income_account') }}</th>
+                            <th></th>
+                        </tr>
+                    </thead>
+                    <tfoot>
+                        <tr>
+                            <th>{{ __('sundries.sundry_name') }}</th>
+                            <th>{{ __('sundries.buying_price') }}</th>
+                            <th>{{ __('sundries.income_account') }}</th>
+                            <th></th>
+                        </tr>
+                    </tfoot>
+                    <tbody>
+                        @foreach($sundries as $sundry)
+                        <tr>
+                            <td>{{ $sundry->name }}</td>
+                            <td>{{ $sundry->buying_price }}</td>
+                            <td>{{ $chart_of_accounts[$sundry->account_id] ?? '' }}</td>
+                            <td>
+                                {{ Form::model($sundry->id ,['method' => 'POST', 'route' => ['sundries.activate', $sundry->id]]) }}
+                                    <button type="submit" class="btn btn-warning" onclick="return confirm('<?php echo __('sundries.are_you_sure');?>')"><i class="fa fa-check"></i> {{ __('sundries.activate') }}</button>
+                                {{ Form::close() }}
+                            </td>
+                        </tr>
+                        @endforeach
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection
+
+@push('scripts')
+
+<script src="{{ asset('elite/bower_components/datatables/jquery.dataTables.min.js') }}"></script>
+
+<script src="{{ asset('elite/tables/js/dataTables.buttons.min.js') }}"></script>
+<script src="{{ asset('elite/tables/js/buttons.flash.min.js') }}"></script>
+<script src="{{ asset('elite/tables/js/jszip.min.js') }}"></script>
+<script src="{{ asset('elite/tables/js/pdfmake.min.js') }}"></script>
+<script src="{{ asset('elite/tables/js/vfs_fonts.js') }}"></script>
+<script src="{{ asset('elite/tables/js/buttons.html5.min.js') }}"></script>
+<script src="{{ asset('elite/tables/js/buttons.print.min.js') }}"></script>
+
+<script>
+
+
+    $('.table').DataTable({
+        dom: 'Bfrtip',
+        buttons: [
+            'copy', 'csv', 'excel', 'pdf', 'print'
+        ]
+    });
+
+</script>
+@endpush