Skip to content

Commit

Permalink
WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
@Blair2004
Blair2004 committed Aug 10, 2023
1 parent 4cf97e5 commit f9e2b27
Show file tree
Hide file tree
Showing 6 changed files with 52 additions and 49 deletions.
19 changes: 2 additions & 17 deletions app/Services/TaxService.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,25 +251,10 @@ public function update( $id, $fields )
public function getComputedTaxGroupValue( $tax_type, $tax_group_id, $price )
{
$taxGroup = TaxGroup::find( $tax_group_id );
$computeTaxSeparately = ns()->option->get( 'ns_pos_tax_compute_group_separately', 'no' );

if ( $taxGroup instanceof TaxGroup ) {
if ( $computeTaxSeparately === 'no' ) {
$summarizedRate = $taxGroup->taxes->sum( 'rate' );
return $this->getVatValue( $tax_type, $summarizedRate, $price );
} else {
return $taxGroup->taxes
->map( function( $tax ) use ( $tax_type, $price ) {
$taxValue = $this->getVatValue(
$tax_type,
floatval( $tax[ 'rate' ] ),
$price
);

return $taxValue;
})
->sum();
}
$summarizedRate = $taxGroup->taxes->sum( 'rate' );
return $this->getVatValue( $tax_type, $summarizedRate, $price );
}

return 0;
Expand Down
2 changes: 1 addition & 1 deletion public/js/app.min.js
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions public/js/bootstrap.min/144.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/js/bootstrap.min/934.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/js/pos-init.min.js
View file

Large diffs are not rendered by default.

75 changes: 46 additions & 29 deletions resources/ts/pos-init.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import { nsRawCurrency } from "./filters/currency";
import moment from "moment";
import Print from "./libraries/print";
import Tax from "./libraries/tax";
import * as math from "mathjs"


/**
Expand Down Expand Up @@ -1621,17 +1622,7 @@ export class POS {
break;
}

// continue here....

const vatValues = taxGroup.taxes.map( tax => {
console.log( price, tax.rate, originalProduct.tax_type );
return this.getVatValue( price, tax.rate, originalProduct.tax_type )
});


if ( vatValues.length > 0 ) {
tax_value = vatValues.reduce( ( b, a ) => b+a );
}
tax_value = this.getVatValue( price, summarizedRates, originalProduct.tax_type );
}

return { price_without_tax, tax_value, price_with_tax };
Expand All @@ -1641,9 +1632,7 @@ export class POS {
const originalProduct = product.$original();
const quantities = product.$quantities();
const result = this.proceedProductTaxComputation( product, quantities.custom_price_edit );

console.log( result );


quantities.custom_price_without_tax = result.price_without_tax;
quantities.custom_price_with_tax = result.price_with_tax;
quantities.custom_price_tax = result.tax_value;
Expand All @@ -1664,6 +1653,8 @@ export class POS {
quantities.sale_price_with_tax = result.price_with_tax;
quantities.sale_price_tax = result.tax_value;

console.log({ quantities });

product.$quantities = () => {
return <ProductUnitQuantity>quantities
}
Expand Down Expand Up @@ -1703,13 +1694,13 @@ export class POS {
if ( product.product_type === 'product' ) {
if (product.mode === 'normal') {
product.unit_price = this.getSalePrice(product.$quantities(), product.$original());
product.tax_value = product.$quantities().sale_price_tax * product.quantity;
product.tax_value = math.chain( product.$quantities().sale_price_tax ).multiply( product.quantity ).done();
} else if (product.mode === 'wholesale') {
product.unit_price = this.getWholesalePrice(product.$quantities(), product.$original());
product.tax_value = product.$quantities().wholesale_price_tax * product.quantity;
product.tax_value = math.chain( product.$quantities().wholesale_price_tax ).multiply( product.quantity ).done();
} if (product.mode === 'custom') {
product.unit_price = this.getCustomPrice(product.$quantities(), product.$original());
product.tax_value = product.$quantities().custom_price_tax * product.quantity;
product.tax_value = math.chain( product.$quantities().custom_price_tax ).multiply( product.quantity ).done();
}
}

Expand All @@ -1718,27 +1709,53 @@ export class POS {
* based on a percentage. @todo While we believe discount
* shouldn't be calculated after taxes
*/
let discount_without_tax = 0;
let discount_with_tax = 0;
let price_with_tax = this.getPrice( product.$quantities(), product.mode, 'with_tax' );
let price_without_tax = this.getPrice( product.$quantities(), product.mode, 'without_tax' );
let discount_without_tax:number = 0;
let discount_with_tax:number = 0;
let price_with_tax:number = this.getPrice( product.$quantities(), product.mode, 'with_tax' );
let price_without_tax:number = this.getPrice( product.$quantities(), product.mode, 'without_tax' );

if (['flat', 'percentage'].includes(product.discount_type)) {
if (product.discount_type === 'percentage') {
product.discount = ((product.unit_price * product.discount_percentage) / 100) * product.quantity;
discount_without_tax = ((price_without_tax * product.discount_percentage) / 100) * product.quantity;
discount_with_tax = ((price_with_tax * product.discount_percentage) / 100) * product.quantity;
product.discount = math.chain(
math.chain(
math.chain( product.unit_price ).multiply( product.discount_percentage ).done()
).divide( 100 ).done()
).multiply( product.quantity ).done();

discount_without_tax = math.chain(
math.chain(
math.chain( price_without_tax ).multiply( product.discount_percentage ).done()
).divide( 100 ).done()
).multiply( product.quantity ).done();

discount_with_tax = math.chain(
math.chain(
math.chain( price_with_tax ).multiply( product.discount_percentage ).done()
).divide( 100 ).done()
).multiply( product.quantity ).done();

} else {
discount_without_tax = product.discount;
discount_with_tax = product.discount;
discount_without_tax = product.discount;
discount_with_tax = product.discount;
}
}

product.price_with_tax = price_with_tax;
product.price_without_tax = price_without_tax;
product.total_price = ( product.unit_price * product.quantity ) - product.discount;
product.total_price_with_tax = ( price_with_tax * product.quantity ) - discount_with_tax;
product.total_price_without_tax = ( price_without_tax * product.quantity ) - discount_without_tax;

product.total_price = math.chain(
math.chain( product.unit_price ).multiply( product.quantity ).done()
).subtract( product.discount ).done();

product.total_price_with_tax = math.chain(
math.chain( price_with_tax ).multiply( product.quantity ).done()
).subtract( discount_with_tax ).done();

product.total_price_without_tax = math.chain(
math.chain( price_without_tax ).multiply( product.quantity ).done()
).subtract( discount_without_tax ).done();

console.log( product );

nsHooks.doAction('ns-after-product-computed', product);
}
Expand Down

0 comments on commit f9e2b27

Please sign in to comment.