beenull/ctrlpanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adding Tax, beautify

Browse source
This commit is contained in:
WBLKLeipe 2021-11-05 07:43:57 +01:00
parent bff97e836d
commit 6797410cb4
3 changed files with 28 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
app/Http/Controllers/Admin/PaymentController.php
View file

@ -30,11 +30,15 @@ class PaymentController extends Controller
public function getTaxPercent(){
return Configuration::getValueByKey("TAX_IN_PERCENT");
$tax = Configuration::getValueByKey("SALES_TAX");
if ( $tax < 0 ) {
return 0;
}
return $tax;
}
public function getTaxValue(PaypalProduct $paypalProduct){
return $paypalProduct->price*Configuration::getValueByKey("TAX_IN_PERCENT")/100;
return $paypalProduct->price*$this->getTaxPercent()/100;
}
public function getTotalPrice(PaypalProduct $paypalProduct){
@ -74,7 +78,6 @@ class PaymentController extends Controller
*/
public function pay(Request $request, PaypalProduct $paypalProduct)
{
$tax = $paypalProduct->price*Configuration::getValueByKey("TAX_IN_PERCENT")/100;
$request = new OrdersCreateRequest();
$request->prefer('return=representation');
$request->body = [
@ -85,7 +88,18 @@ class PaymentController extends Controller
"description" => $paypalProduct->description,
"amount" => [
"value" => $this->getTotalPrice($paypalProduct),
"currency_code" => strtoupper($paypalProduct->currency_code)
'currency_code' => strtoupper($paypalProduct->currency_code),
'breakdown' =>[
'item_total' =>
[
'currency_code' => strtoupper($paypalProduct->currency_code),
'value' => $paypalProduct->price,
],
'tax_total' =>
[
'currency_code' => strtoupper($paypalProduct->currency_code),
'value' => $this->getTaxValue($paypalProduct),
]
]
]
],

35
database/migrations/2021_11_04_195244_tax_in_config.php
View file

@ -1,35 +0,0 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class TaxInConfig extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
DB::table('configurations')->insert(
array(
'key' => 'TAX_IN_PERCENT',
'value' => '0',
'type' => 'integer',
'description' => 'The %-value of tax that will be added to the product price on checkout',
)
);
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
}
}

8
database/seeders/Seeds/ConfigurationSeeder.php
View file

@ -136,6 +136,14 @@ class ConfigurationSeeder extends Seeder
'type' => 'boolean',
'description' => 'Charges the first hour worth of credits upon creating a server.'
]);
//sales tax
Configuration::firstOrCreate([
'key' => 'SALES_TAX',
], [
'value' => '0',
'type' => 'integer',
'description' => 'The %-value of tax that will be added to the product price on checkout'
]);
}
}