From ef77acd2f0395077f76e16808ca8b93caaa98a1c Mon Sep 17 00:00:00 2001 From: Fahim Date: Mon, 2 Aug 2021 23:29:23 +0600 Subject: [PATCH] Added: Sales Module --- .../Resources/views/create.blade.php | 4 - .../Resources/views/expenses/create.blade.php | 11 +- .../Resources/views/expenses/edit.blade.php | 11 +- .../Resources/views/products/create.blade.php | 12 +- .../Resources/views/products/edit.blade.php | 12 +- Modules/Sale/Config/.gitkeep | 0 Modules/Sale/Config/config.php | 5 + Modules/Sale/Console/.gitkeep | 0 Modules/Sale/Database/Migrations/.gitkeep | 0 .../2021_07_31_201003_create_sales_table.php | 48 ++++ ...07_31_212446_create_sale_details_table.php | 46 ++++ Modules/Sale/Database/Seeders/.gitkeep | 0 .../Database/Seeders/SaleDatabaseSeeder.php | 21 ++ Modules/Sale/Database/factories/.gitkeep | 0 Modules/Sale/Entities/.gitkeep | 0 Modules/Sale/Entities/Sale.php | 41 ++++ Modules/Sale/Entities/SaleDetails.php | 44 ++++ Modules/Sale/Http/Controllers/.gitkeep | 0 .../Sale/Http/Controllers/SaleController.php | 211 ++++++++++++++++++ Modules/Sale/Http/Middleware/.gitkeep | 0 Modules/Sale/Http/Requests/.gitkeep | 0 .../Sale/Http/Requests/StoreSaleRequest.php | 40 ++++ .../Sale/Http/Requests/UpdateSaleRequest.php | 40 ++++ Modules/Sale/Providers/.gitkeep | 0 .../Sale/Providers/RouteServiceProvider.php | 69 ++++++ .../Sale/Providers/SaleServiceProvider.php | 112 ++++++++++ Modules/Sale/Resources/assets/.gitkeep | 0 Modules/Sale/Resources/assets/js/app.js | 0 Modules/Sale/Resources/assets/sass/app.scss | 0 Modules/Sale/Resources/lang/.gitkeep | 0 Modules/Sale/Resources/views/.gitkeep | 0 Modules/Sale/Resources/views/create.blade.php | 130 +++++++++++ Modules/Sale/Resources/views/edit.blade.php | 133 +++++++++++ Modules/Sale/Resources/views/index.blade.php | 40 ++++ .../views/partials/actions.blade.php | 24 ++ .../views/partials/payment-status.blade.php | 13 ++ .../Resources/views/partials/status.blade.php | 13 ++ Modules/Sale/Resources/views/show.blade.php | 0 Modules/Sale/Routes/.gitkeep | 0 Modules/Sale/Routes/api.php | 18 ++ Modules/Sale/Routes/web.php | 18 ++ Modules/Sale/Tests/Feature/.gitkeep | 0 Modules/Sale/Tests/Unit/.gitkeep | 0 Modules/Sale/composer.json | 23 ++ Modules/Sale/module.json | 13 ++ Modules/Sale/package.json | 17 ++ Modules/Sale/webpack.mix.js | 14 ++ .../Setting/Resources/views/index.blade.php | 2 +- app/DataTables/SalesDataTable.php | 96 ++++++++ app/Helpers/helpers.php | 10 +- app/Http/Livewire/Adjustment/ProductTable.php | 4 +- app/Http/Livewire/ProductCart.php | 176 +++++++++++++++ app/Http/Livewire/SearchProduct.php | 2 +- config/cart.php | 2 +- modules_statuses.json | 3 +- resources/views/layouts/menu.blade.php | 24 ++ .../includes/product-cart-modal.blade.php | 41 ++++ .../includes/product-cart-quantity.blade.php | 8 + .../views/livewire/product-cart.blade.php | 135 +++++++++++ 59 files changed, 1645 insertions(+), 41 deletions(-) create mode 100644 Modules/Sale/Config/.gitkeep create mode 100644 Modules/Sale/Config/config.php create mode 100644 Modules/Sale/Console/.gitkeep create mode 100644 Modules/Sale/Database/Migrations/.gitkeep create mode 100644 Modules/Sale/Database/Migrations/2021_07_31_201003_create_sales_table.php create mode 100644 Modules/Sale/Database/Migrations/2021_07_31_212446_create_sale_details_table.php create mode 100644 Modules/Sale/Database/Seeders/.gitkeep create mode 100644 Modules/Sale/Database/Seeders/SaleDatabaseSeeder.php create mode 100644 Modules/Sale/Database/factories/.gitkeep create mode 100644 Modules/Sale/Entities/.gitkeep create mode 100644 Modules/Sale/Entities/Sale.php create mode 100644 Modules/Sale/Entities/SaleDetails.php create mode 100644 Modules/Sale/Http/Controllers/.gitkeep create mode 100644 Modules/Sale/Http/Controllers/SaleController.php create mode 100644 Modules/Sale/Http/Middleware/.gitkeep create mode 100644 Modules/Sale/Http/Requests/.gitkeep create mode 100644 Modules/Sale/Http/Requests/StoreSaleRequest.php create mode 100644 Modules/Sale/Http/Requests/UpdateSaleRequest.php create mode 100644 Modules/Sale/Providers/.gitkeep create mode 100644 Modules/Sale/Providers/RouteServiceProvider.php create mode 100644 Modules/Sale/Providers/SaleServiceProvider.php create mode 100644 Modules/Sale/Resources/assets/.gitkeep create mode 100644 Modules/Sale/Resources/assets/js/app.js create mode 100644 Modules/Sale/Resources/assets/sass/app.scss create mode 100644 Modules/Sale/Resources/lang/.gitkeep create mode 100644 Modules/Sale/Resources/views/.gitkeep create mode 100644 Modules/Sale/Resources/views/create.blade.php create mode 100644 Modules/Sale/Resources/views/edit.blade.php create mode 100644 Modules/Sale/Resources/views/index.blade.php create mode 100644 Modules/Sale/Resources/views/partials/actions.blade.php create mode 100644 Modules/Sale/Resources/views/partials/payment-status.blade.php create mode 100644 Modules/Sale/Resources/views/partials/status.blade.php create mode 100644 Modules/Sale/Resources/views/show.blade.php create mode 100644 Modules/Sale/Routes/.gitkeep create mode 100644 Modules/Sale/Routes/api.php create mode 100644 Modules/Sale/Routes/web.php create mode 100644 Modules/Sale/Tests/Feature/.gitkeep create mode 100644 Modules/Sale/Tests/Unit/.gitkeep create mode 100644 Modules/Sale/composer.json create mode 100644 Modules/Sale/module.json create mode 100644 Modules/Sale/package.json create mode 100644 Modules/Sale/webpack.mix.js create mode 100644 app/DataTables/SalesDataTable.php create mode 100644 app/Http/Livewire/ProductCart.php create mode 100644 resources/views/livewire/includes/product-cart-modal.blade.php create mode 100644 resources/views/livewire/includes/product-cart-quantity.blade.php create mode 100644 resources/views/livewire/product-cart.blade.php diff --git a/Modules/Adjustment/Resources/views/create.blade.php b/Modules/Adjustment/Resources/views/create.blade.php index 28b26421..97cc5376 100644 --- a/Modules/Adjustment/Resources/views/create.blade.php +++ b/Modules/Adjustment/Resources/views/create.blade.php @@ -2,10 +2,6 @@ @section('title', 'Create Adjustment') -@push('page_css') - @livewireStyles -@endpush - @section('breadcrumb')
  1. Home
    2. diff --git a/Modules/Expense/Resources/views/expenses/create.blade.php b/Modules/Expense/Resources/views/expenses/create.blade.php index 994d2204..ca5a3d96 100644 --- a/Modules/Expense/Resources/views/expenses/create.blade.php +++ b/Modules/Expense/Resources/views/expenses/create.blade.php @@ -76,14 +76,9 @@ + +@endpush diff --git a/Modules/Sale/Resources/views/edit.blade.php b/Modules/Sale/Resources/views/edit.blade.php new file mode 100644 index 00000000..08d0b2bd --- /dev/null +++ b/Modules/Sale/Resources/views/edit.blade.php @@ -0,0 +1,133 @@ +@extends('layouts.app') + +@section('title', 'Edit Sale') + +@section('breadcrumb') +
      +
    1. Home
      2. +
    2. Sales
      3. +
    3. Edit
      4. +
    +@endsection + +@section('content') +
    +
    +
    + +
    +
    + +
    +
    +
    +
    + @include('utils.alerts') +
    + @csrf + @method('patch') +
    +
    +
    + + +
    +
    +
    +
    +
    + + +
    +
    +
    +
    +
    +
    + + +
    +
    +
    +
    + + + +
    +
    +
    + + +
    +
    +
    +
    +
    + + +
    +
    +
    +
    +
    +
    + + +
    +
    +
    +
    + +
    + + +
    + +
    + +
    + +
    +
    +
    +
    +
    +@endsection + +@push('page_scripts') + + +@endpush diff --git a/Modules/Sale/Resources/views/index.blade.php b/Modules/Sale/Resources/views/index.blade.php new file mode 100644 index 00000000..7a26814e --- /dev/null +++ b/Modules/Sale/Resources/views/index.blade.php @@ -0,0 +1,40 @@ +@extends('layouts.app') + +@section('title', 'Sales') + +@section('third_party_stylesheets') + +@endsection + +@section('breadcrumb') +
      +
    1. Home
      2. +
    2. Sales
      3. +
    +@endsection + +@section('content') +
    +
    +
    +
    +
    + + Add Sale + + +
    + +
    + {!! $dataTable->table() !!} +
    +
    +
    +
    +
    +
    +@endsection + +@push('page_scripts') + {!! $dataTable->scripts() !!} +@endpush diff --git a/Modules/Sale/Resources/views/partials/actions.blade.php b/Modules/Sale/Resources/views/partials/actions.blade.php new file mode 100644 index 00000000..80f27521 --- /dev/null +++ b/Modules/Sale/Resources/views/partials/actions.blade.php @@ -0,0 +1,24 @@ +@can('edit_sales') + + + +@endcan +@can('show_sales') + + + +@endcan +@can('delete_sales') + +@endcan diff --git a/Modules/Sale/Resources/views/partials/payment-status.blade.php b/Modules/Sale/Resources/views/partials/payment-status.blade.php new file mode 100644 index 00000000..c3c938be --- /dev/null +++ b/Modules/Sale/Resources/views/partials/payment-status.blade.php @@ -0,0 +1,13 @@ +@if ($data->payment_status == 'Partial') + + {{ $data->payment_status }} + +@elseif ($data->payment_status == 'Paid') + + {{ $data->payment_status }} + +@else + + {{ $data->payment_status }} + +@endif diff --git a/Modules/Sale/Resources/views/partials/status.blade.php b/Modules/Sale/Resources/views/partials/status.blade.php new file mode 100644 index 00000000..e6f2dfe7 --- /dev/null +++ b/Modules/Sale/Resources/views/partials/status.blade.php @@ -0,0 +1,13 @@ +@if ($data->status == 'Pending') + + {{ $data->status }} + +@elseif ($data->status == 'Shipped') + + {{ $data->status }} + +@else + + {{ $data->status }} + +@endif diff --git a/Modules/Sale/Resources/views/show.blade.php b/Modules/Sale/Resources/views/show.blade.php new file mode 100644 index 00000000..e69de29b diff --git a/Modules/Sale/Routes/.gitkeep b/Modules/Sale/Routes/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Modules/Sale/Routes/api.php b/Modules/Sale/Routes/api.php new file mode 100644 index 00000000..208715c9 --- /dev/null +++ b/Modules/Sale/Routes/api.php @@ -0,0 +1,18 @@ +get('/sale', function (Request $request) { + return $request->user(); +}); \ No newline at end of file diff --git a/Modules/Sale/Routes/web.php b/Modules/Sale/Routes/web.php new file mode 100644 index 00000000..3e6207cd --- /dev/null +++ b/Modules/Sale/Routes/web.php @@ -0,0 +1,18 @@ + 'auth'], function () { + + Route::resource('sales', 'SaleController'); + +}); diff --git a/Modules/Sale/Tests/Feature/.gitkeep b/Modules/Sale/Tests/Feature/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Modules/Sale/Tests/Unit/.gitkeep b/Modules/Sale/Tests/Unit/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Modules/Sale/composer.json b/Modules/Sale/composer.json new file mode 100644 index 00000000..3f12ad16 --- /dev/null +++ b/Modules/Sale/composer.json @@ -0,0 +1,23 @@ +{ + "name": "nwidart/sale", + "description": "", + "authors": [ + { + "name": "Nicolas Widart", + "email": "n.widart@gmail.com" + } + ], + "extra": { + "laravel": { + "providers": [], + "aliases": { + + } + } + }, + "autoload": { + "psr-4": { + "Modules\\Sale\\": "" + } + } +} diff --git a/Modules/Sale/module.json b/Modules/Sale/module.json new file mode 100644 index 00000000..130fce24 --- /dev/null +++ b/Modules/Sale/module.json @@ -0,0 +1,13 @@ +{ + "name": "Sale", + "alias": "sale", + "description": "", + "keywords": [], + "priority": 0, + "providers": [ + "Modules\\Sale\\Providers\\SaleServiceProvider" + ], + "aliases": {}, + "files": [], + "requires": [] +} diff --git a/Modules/Sale/package.json b/Modules/Sale/package.json new file mode 100644 index 00000000..4599509f --- /dev/null +++ b/Modules/Sale/package.json @@ -0,0 +1,17 @@ +{ + "private": true, + "scripts": { + "dev": "npm run development", + "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", + "watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", + "watch-poll": "npm run watch -- --watch-poll", + "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js", + "prod": "npm run production", + "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js" + }, + "devDependencies": { + "cross-env": "^7.0", + "laravel-mix": "^5.0.1", + "laravel-mix-merge-manifest": "^0.1.2" + } +} diff --git a/Modules/Sale/webpack.mix.js b/Modules/Sale/webpack.mix.js new file mode 100644 index 00000000..76da2b44 --- /dev/null +++ b/Modules/Sale/webpack.mix.js @@ -0,0 +1,14 @@ +const dotenvExpand = require('dotenv-expand'); +dotenvExpand(require('dotenv').config({ path: '../../.env'/*, debug: true*/})); + +const mix = require('laravel-mix'); +require('laravel-mix-merge-manifest'); + +mix.setPublicPath('../../public').mergeManifest(); + +mix.js(__dirname + '/Resources/assets/js/app.js', 'js/sale.js') + .sass( __dirname + '/Resources/assets/sass/app.scss', 'css/sale.css'); + +if (mix.inProduction()) { + mix.version(); +} diff --git a/Modules/Setting/Resources/views/index.blade.php b/Modules/Setting/Resources/views/index.blade.php index 341d94e1..0c08b12f 100644 --- a/Modules/Setting/Resources/views/index.blade.php +++ b/Modules/Setting/Resources/views/index.blade.php @@ -15,7 +15,7 @@
    @include('utils.alerts')
    -
    +
    General Settings
    diff --git a/app/DataTables/SalesDataTable.php b/app/DataTables/SalesDataTable.php new file mode 100644 index 00000000..326d66e0 --- /dev/null +++ b/app/DataTables/SalesDataTable.php @@ -0,0 +1,96 @@ +eloquent($query) + ->addColumn('total_amount', function ($data) { + return format_currency($data->total_amount); + }) + ->addColumn('paid_amount', function ($data) { + return format_currency($data->paid_amount); + }) + ->addColumn('due_amount', function ($data) { + return format_currency($data->due_amount); + }) + ->addColumn('status', function ($data) { + return view('sale::partials.status', compact('data')); + }) + ->addColumn('payment_status', function ($data) { + return view('sale::partials.payment-status', compact('data')); + }) + ->addColumn('action', function ($data) { + return view('sale::partials.actions', compact('data')); + }); + } + + public function query(Sale $model) { + return $model->newQuery(); + } + + public function html() { + return $this->builder() + ->setTableId('sales-table') + ->columns($this->getColumns()) + ->minifiedAjax() + ->dom("<'row'<'col-md-3'l><'col-md-5 mb-2'B><'col-md-4'f>> . + 'tr' . + <'row'<'col-md-5'i><'col-md-7 mt-2'p>>") + ->buttons( + Button::make('excel') + ->text(' Excel'), + Button::make('print') + ->text(' Print'), + Button::make('reset') + ->text(' Reset'), + Button::make('reload') + ->text(' Reload') + ); + } + + protected function getColumns() { + return [ + Column::make('reference') + ->className('text-center align-middle'), + + Column::make('customer_name') + ->title('Customer') + ->className('text-center align-middle'), + + Column::computed('status') + ->className('text-center align-middle'), + + Column::computed('total_amount') + ->className('text-center align-middle'), + + Column::computed('paid_amount') + ->className('text-center align-middle'), + + Column::computed('due_amount') + ->className('text-center align-middle'), + + Column::computed('payment_status') + ->className('text-center align-middle'), + + Column::computed('action') + ->exportable(false) + ->printable(false) + ->className('text-center align-middle') + ]; + } + + protected function filename() { + return 'Sales_' . date('YmdHis'); + } +} diff --git a/app/Helpers/helpers.php b/app/Helpers/helpers.php index a6fcdacf..18d1d0ab 100644 --- a/app/Helpers/helpers.php +++ b/app/Helpers/helpers.php @@ -7,11 +7,15 @@ if (!function_exists('settings')) { } if (!function_exists('format_currency')) { - function format_currency($value) { + function format_currency($value, $format = true) { + if (!$format) { + return $value; + } + if (settings()->default_currency_position == 'prefix') { - $formatted_value = settings()->currency->symbol . number_format($value, 2, settings()->currency->decimal_separator, settings()->currency->thousand_separator); + $formatted_value = settings()->currency->symbol . number_format((float) $value, 2, settings()->currency->decimal_separator, settings()->currency->thousand_separator); } else { - $formatted_value = number_format($value, 2, settings()->currency->decimal_separator, settings()->currency->thousand_separator) . settings()->currency->symbol; + $formatted_value = number_format((float) $value, 2, settings()->currency->decimal_separator, settings()->currency->thousand_separator) . settings()->currency->symbol; } return $formatted_value; diff --git a/app/Http/Livewire/Adjustment/ProductTable.php b/app/Http/Livewire/Adjustment/ProductTable.php index 57161845..8cc8f1a8 100644 --- a/app/Http/Livewire/Adjustment/ProductTable.php +++ b/app/Http/Livewire/Adjustment/ProductTable.php @@ -35,12 +35,12 @@ class ProductTable extends Component if (in_array($product, array_map(function ($adjustment) { return $adjustment['product']; }, $this->products))) { - return session()->flash('message', 'Already exists in the product table!'); + return session()->flash('message', 'Already exists in the product list!'); } break; case false: if (in_array($product, $this->products)) { - return session()->flash('message', 'Already exists in the product table!'); + return session()->flash('message', 'Already exists in the product list!'); } break; default: diff --git a/app/Http/Livewire/ProductCart.php b/app/Http/Livewire/ProductCart.php new file mode 100644 index 00000000..165cdb2a --- /dev/null +++ b/app/Http/Livewire/ProductCart.php @@ -0,0 +1,176 @@ +cart_instance = $cartInstance; + + if ($sale) { + $this->sale = $sale; + + $this->global_discount = $sale->discount_percentage; + $this->global_tax = $sale->tax_percentage; + $this->shipping = $sale->shipping_amount; + + $this->updatedGlobalTax(); + $this->updatedGlobalDiscount(); + + $sale_details = $this->sale->saleDetails; + + foreach ($sale_details as $sale_detail) { + $this->check_quantity[$sale_detail->product_id] = [$sale_detail->product->product_quantity]; + $this->quantity[$sale_detail->product_id] = $sale_detail->quantity; + $this->discount_type[$sale_detail->product_id] = 'fixed'; + $this->item_discount[$sale_detail->product_id] = $sale_detail->product_discount_amount; + } + } else { + $this->global_discount = 0; + $this->global_tax = 0; + $this->shipping = 0.00; + $this->check_quantity = []; + $this->quantity = []; + $this->discount_type = []; + $this->item_discount = []; + } + } + + public function render() { + $cart_items = Cart::instance($this->cart_instance)->content(); + + return view('livewire.product-cart', [ + 'cart_items' => $cart_items + ]); + } + + public function productSelected($product) { + $cart = Cart::instance($this->cart_instance); + + $exists = $cart->search(function ($cartItem, $rowId) use ($product) { + return $cartItem->id == $product['id']; + }); + + if ($exists->isNotEmpty()) { + session()->flash('message', 'Product exists in the cart!'); + return; + } + + $cart->add([ + 'id' => $product['id'], + 'name' => $product['product_name'], + 'qty' => 1, + 'price' => $this->calculate($product)['price'], + 'weight' => 1, + 'options' => [ + 'product_discount' => 0.00, + 'sub_total' => $this->calculate($product)['sub_total'], + 'code' => $product['product_code'], + 'stock' => $product['product_quantity'], + 'product_tax' => $this->calculate($product)['product_tax'], + 'unit_price' => $this->calculate($product)['unit_price'] + ] + ]); + + $this->check_quantity[$product['id']] = $product['product_quantity']; + $this->quantity[$product['id']] = 1; + $this->discount_type[$product['id']] = 'fixed'; + $this->item_discount[$product['id']] = 0; + } + + public function removeItem($row_id) { + Cart::instance($this->cart_instance)->remove($row_id); + } + + public function updatedGlobalTax() { + Cart::instance($this->cart_instance)->setGlobalTax((integer)$this->global_tax); + } + + public function updatedGlobalDiscount() { + Cart::instance($this->cart_instance)->setGlobalDiscount((integer)$this->global_discount); + } + + public function updateQuantity($row_id, $product_id) { + if ($this->check_quantity[$product_id] < $this->quantity[$product_id]) { + session()->flash('message', 'The requested quantity is not available in stock.'); + return; + } + + Cart::instance($this->cart_instance)->update($row_id, $this->quantity[$product_id]); + + $cart_item = Cart::instance($this->cart_instance)->get($row_id); + + Cart::instance($this->cart_instance)->update($row_id, [ + 'options' => [ + 'sub_total' => $cart_item->price * $cart_item->qty, + 'code' => $cart_item->options->code, + 'stock' => $cart_item->options->stock, + 'product_tax' => $cart_item->options->product_tax, + 'unit_price' => $cart_item->options->unit_price, + 'product_discount' => $cart_item->options->product_discount, + ] + ]); + } + + public function setProductDiscount($row_id, $product_id) { + $cart_item = Cart::instance($this->cart_instance)->get($row_id); + + if ($this->discount_type[$product_id] == 'fixed') { + Cart::instance($this->cart_instance)->update($row_id, ['price' => ($cart_item->price + $cart_item->options->product_discount) - $this->item_discount[$product_id]]); + + Cart::instance($this->cart_instance)->update($row_id, ['options' => [ + 'sub_total' => $cart_item->price * $cart_item->qty, + 'code' => $cart_item->options->code, + 'stock' => $cart_item->options->stock, + 'product_tax' => $cart_item->options->product_tax, + 'unit_price' => $cart_item->options->unit_price, + 'product_discount' => $this->item_discount[$product_id], + ]]); + } + } + + public function calculate($product) { + $price = 0; + $unit_price = 0; + $product_tax = 0; + $sub_total = 0; + + if ($product['product_tax_type'] == 1) { + $price = $product['product_price'] + ($product['product_price'] * ($product['product_order_tax'] / 100)); + $unit_price = $product['product_price']; + $product_tax = $product['product_price'] * ($product['product_order_tax'] / 100); + $sub_total = $product['product_price'] + ($product['product_price'] * ($product['product_order_tax'] / 100)); + } + elseif ($product['product_tax_type'] == 2) { + $price = $product['product_price']; + $unit_price = $product['product_price'] - ($product['product_price'] * ($product['product_order_tax'] / 100)); + $product_tax = $product['product_price'] * ($product['product_order_tax'] / 100); + $sub_total = $product['product_price']; + } + else { + $price = $product['product_price']; + $unit_price = $product['product_price']; + $product_tax = 0.00; + $sub_total = $product['product_price']; + } + + return ['price' => $price, 'unit_price' => $unit_price, 'product_tax' => $product_tax, 'sub_total' => $sub_total]; + } +} diff --git a/app/Http/Livewire/SearchProduct.php b/app/Http/Livewire/SearchProduct.php index f479f8e5..54b54877 100644 --- a/app/Http/Livewire/SearchProduct.php +++ b/app/Http/Livewire/SearchProduct.php @@ -24,7 +24,7 @@ class SearchProduct extends Component public function updatedQuery() { $this->searchResults = Product::where('product_name', 'like', '%' . $this->query . '%') ->orWhere('product_code', 'like', '%' . $this->query . '%') - ->get(); + ->take(6)->get(); } public function resetQuery() { diff --git a/config/cart.php b/config/cart.php index b5bae08a..060ccf1c 100644 --- a/config/cart.php +++ b/config/cart.php @@ -72,7 +72,7 @@ return [ 'decimal_point' => '.', - 'thousand_separator' => ',', + 'thousand_separator' => '', ], diff --git a/modules_statuses.json b/modules_statuses.json index e33e86a9..1ac65f2f 100644 --- a/modules_statuses.json +++ b/modules_statuses.json @@ -6,5 +6,6 @@ "Expense": true, "People": true, "Currency": true, - "Setting": true + "Setting": true, + "Sale": true } \ No newline at end of file diff --git a/resources/views/layouts/menu.blade.php b/resources/views/layouts/menu.blade.php index ca801cb4..23932372 100644 --- a/resources/views/layouts/menu.blade.php +++ b/resources/views/layouts/menu.blade.php @@ -62,6 +62,30 @@ @endcan +@can('access_sales') +
  2. + + Sales + + @can('create_sales') + + @endcan + +
    3. +@endcan + @can('access_expenses')
  3. diff --git a/resources/views/livewire/includes/product-cart-modal.blade.php b/resources/views/livewire/includes/product-cart-modal.blade.php new file mode 100644 index 00000000..b7484dba --- /dev/null +++ b/resources/views/livewire/includes/product-cart-modal.blade.php @@ -0,0 +1,41 @@ + + + + + + diff --git a/resources/views/livewire/includes/product-cart-quantity.blade.php b/resources/views/livewire/includes/product-cart-quantity.blade.php new file mode 100644 index 00000000..9da2377b --- /dev/null +++ b/resources/views/livewire/includes/product-cart-quantity.blade.php @@ -0,0 +1,8 @@ +
    +
    + + +
    +
    diff --git a/resources/views/livewire/product-cart.blade.php b/resources/views/livewire/product-cart.blade.php new file mode 100644 index 00000000..2ed139be --- /dev/null +++ b/resources/views/livewire/product-cart.blade.php @@ -0,0 +1,135 @@ +
    +
    + @if (session()->has('message')) + + @endif +
    + + + + + + + + + + + + + + + @if($cart_items->isNotEmpty()) + @foreach($cart_items as $cart_item) + + + + + + + + + + + + + + + + + + @endforeach + @else + + + + @endif + +
    ProductNet Unit PriceStockQuantityDiscountTaxSub TotalAction
    + {{ $cart_item->name }}
    + + {{ $cart_item->options->code }} + + @include('livewire.includes.product-cart-modal') +     		{{ format_currency($cart_item->options->unit_price) }} + {{ $cart_item->options->stock }} + + @include('livewire.includes.product-cart-quantity') + + {{ format_currency($cart_item->options->product_discount) }} + + {{ format_currency($cart_item->options->product_tax) }} + + {{ format_currency($cart_item->options->sub_total) }} + + +
    + + Please search & select products! + +
    +
    +
    + +
    +
    +
    + + + + + + + + + + + + + + + + + @php + $total_with_shipping = Cart::instance('sale')->total() + (float) $shipping + @endphp + + +
    Order Tax ({{ $global_tax }}%)(+) {{ format_currency(Cart::instance('sale')->tax()) }}
    Discount ({{ $global_discount }}%)(-) {{ format_currency(Cart::instance('sale')->discount()) }}
    Shipping(+) {{ format_currency($shipping) }}
    Grand Total + (=) {{ format_currency($total_with_shipping) }} +
    +
    +
    +
    + + + +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +