Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for cba

Browse Source
This commit is contained in:
David Bomba 2024-09-24 09:08:47 +10:00
parent 3dc5fb2dde
commit 16d716230b
6 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/SearchController.php
View File

@ -96,13 +96,13 @@ class SearchController extends Controller
private function mapResults(array $results) private function mapResults(array $results)
{ {
foreach($results as $result) { foreach($results as $result) {
switch($result['_index']) { switch($result['_index']) {
case 'clients': case 'clients':
if($result['_source']['is_deleted']) //do not return deleted results if($result['_source']['is_deleted']) //do not return deleted results
break; break;
$this->clients[] = [ $this->clients[] = [
'name' => $result['_source']['name'], 'name' => $result['_source']['name'],

1
app/Models/CompanyGateway.php
View File

@ -489,7 +489,6 @@ class CompanyGateway extends BaseModel
public function getSettings() public function getSettings()
{ {
// return $this->settings;
return $this->settings ?? new \stdClass; return $this->settings ?? new \stdClass;
} }

1
app/PaymentDrivers/CBAPowerBoard/CreditCard.php
View File

@ -39,7 +39,6 @@ class CreditCard implements LivewireMethodInterface
public function authorizeView(array $data) public function authorizeView(array $data)
{ {
$data['payment_method_id'] = GatewayType::CREDIT_CARD; $data['payment_method_id'] = GatewayType::CREDIT_CARD;
$data['threeds'] = $this->powerboard->company_gateway->getConfigField('threeds');
return render('gateways.powerboard.credit_card.authorize', $this->paymentData($data)); return render('gateways.powerboard.credit_card.authorize', $this->paymentData($data));
} }

6
app/PaymentDrivers/CBAPowerBoard/Settings.php
View File

@ -35,8 +35,6 @@ class Settings
if($r->failed()) if($r->failed())
$r->throw(); $r->throw();
nlog($r->object());
return (new \App\PaymentDrivers\CBAPowerBoard\Models\Parse())->encode(Gateway::class."[]", $r->object()->resource->data); return (new \App\PaymentDrivers\CBAPowerBoard\Models\Parse())->encode(Gateway::class."[]", $r->object()->resource->data);
@ -68,7 +66,11 @@ class Settings
default => $type = self::GATEWAY_CBA, default => $type = self::GATEWAY_CBA,
}; };
if($type == self::GATEWAY_CBA)
return $this->powerboard->company_gateway->getConfigField('gatewayId') ?? $this->getGatewayByType($type);
return $this->getGatewayByType($type); return $this->getGatewayByType($type);
} }
private function getGatewayByType(string $gateway_type_const): mixed private function getGatewayByType(string $gateway_type_const): mixed

10
database/migrations/2024_09_06_042040_cba_powerboard.php
View File

@ -21,8 +21,13 @@ return new class extends Migration
$fields->publicKey = ''; $fields->publicKey = '';
$fields->secretKey = ''; $fields->secretKey = '';
$fields->testMode = false; $fields->testMode = false;
$fields->threeds = false; $fields->gatewayId = '';
if($gateway = Gateway::find(64)){
$gateway->fields = json_encode($fields);
$gateway->save();
}else{
$powerboard = new Gateway(); $powerboard = new Gateway();
$powerboard->id = 64; $powerboard->id = 64;
$powerboard->name = 'CBA PowerBoard'; $powerboard->name = 'CBA PowerBoard';
@ -34,7 +39,8 @@ return new class extends Migration
$powerboard->fields = json_encode($fields); $powerboard->fields = json_encode($fields);
$powerboard->save(); $powerboard->save();
}
Schema::table("company_gateways", function (\Illuminate\Database\Schema\Blueprint $table){ Schema::table("company_gateways", function (\Illuminate\Database\Schema\Blueprint $table){
$table->text('settings')->nullable(); $table->text('settings')->nullable();
}); });

2
database/seeders/PaymentLibrariesSeeder.php
View File

@ -89,7 +89,7 @@ class PaymentLibrariesSeeder extends Seeder
['id' => 61, 'name' => 'PayPal Platform', 'provider' => 'PayPal_PPCP', 'key' => '80af24a6a691230bbec33e930ab40666', 'fields' => '{"testMode":false}'], ['id' => 61, 'name' => 'PayPal Platform', 'provider' => 'PayPal_PPCP', 'key' => '80af24a6a691230bbec33e930ab40666', 'fields' => '{"testMode":false}'],
['id' => 62, 'name' => 'BTCPay', 'provider' => 'BTCPay', 'key' => 'vpyfbmdrkqcicpkjqdusgjfluebftuva', 'fields' => '{"btcpayUrl":"", "apiKey":"", "storeId":"", "webhookSecret":""}'], ['id' => 62, 'name' => 'BTCPay', 'provider' => 'BTCPay', 'key' => 'vpyfbmdrkqcicpkjqdusgjfluebftuva', 'fields' => '{"btcpayUrl":"", "apiKey":"", "storeId":"", "webhookSecret":""}'],
['id' => 63, 'name' => 'Rotessa', 'is_offsite' => false, 'sort_order' => 22, 'provider' => 'Rotessa', 'key' => '91be24c7b792230bced33e930ac61676', 'fields' => '{"apiKey":"", "testMode":false}'], ['id' => 63, 'name' => 'Rotessa', 'is_offsite' => false, 'sort_order' => 22, 'provider' => 'Rotessa', 'key' => '91be24c7b792230bced33e930ac61676', 'fields' => '{"apiKey":"", "testMode":false}'],
['id' => 64, 'name' => 'CBA PowerBoard', 'is_offsite' => false, 'sort_order' => 26, 'provider' => 'CBAPowerBoard', 'key' => 'b67581d804dbad1743b61c57285142ad', 'fields' => '{"publicKey":"", "secretKey":"", "testMode":false, "Threeds":true}'], ['id' => 64, 'name' => 'CBA PowerBoard', 'is_offsite' => false, 'sort_order' => 26, 'provider' => 'CBAPowerBoard', 'key' => 'b67581d804dbad1743b61c57285142ad', 'fields' => '{"publicKey":"", "secretKey":"", "testMode":false, "gatewayId":""}'],
['id' => 65, 'name' => 'Blockonomics', 'is_offsite' => false, 'sort_order' => 27, 'provider' => 'Blockonomics', 'key' => 'wbhf02us6owgo7p4nfjd0ymssdshks4d', 'fields' => '{"apiKey":"", "callbackSecret":""}'], ['id' => 65, 'name' => 'Blockonomics', 'is_offsite' => false, 'sort_order' => 27, 'provider' => 'Blockonomics', 'key' => 'wbhf02us6owgo7p4nfjd0ymssdshks4d', 'fields' => '{"apiKey":"", "callbackSecret":""}'],
]; ];