Compare commits

...

19 Commits

Author SHA1 Message Date
David Bomba 328d0d7482
Merge pull request #11253 from turbo124/v5-stable
v5.12.23
2025-09-02 07:24:54 +10:00
David Bomba 6de203775b Merge branch 'v5-develop' into v5-stable 2025-09-02 07:24:12 +10:00
David Bomba a3be6c6bab v5.12.23 2025-09-02 07:14:15 +10:00
David Bomba 0ea98ffe7d
Merge pull request #10718 from turbo124/v5-stable
v5.11.43
2025-03-02 08:11:52 +11:00
David Bomba d49b63d18d Merge branch 'v5-develop' into v5-stable 2025-03-02 08:10:20 +11:00
David Bomba 047c3d0bdd
Merge pull request #10716 from turbo124/v5-stable
v5.11.42
2025-03-02 08:05:09 +11:00
David Bomba 99d41a3794 Merge branch 'v5-develop' into v5-stable 2025-03-02 08:04:36 +11:00
David Bomba 6765bfef3f
Merge pull request #10458 from turbo124/v5-stable
v5.11.8
2025-01-04 19:40:44 +11:00
David Bomba 7e5cb8fe81 Merge branch 'v5-develop' into v5-stable 2025-01-04 19:40:10 +11:00
David Bomba b53818aa16
Merge pull request #10357 from turbo124/v5-stable
V5 stable
2024-12-08 16:41:52 +11:00
David Bomba 69a9225957 Merge branch 'v5-develop' into v5-stable 2024-12-08 16:41:14 +11:00
David Bomba 7b02668d4b
Merge pull request #10327 from HansGruber51/patch-1
Update manifest.json
2024-12-03 12:23:55 +11:00
HansGruber51 33c68b628d
Update manifest.json
This Github file has an error at the end. So when I try to deploy with git on my plesk it doesn't even load the setup page.
Conflict problem on the call of the CSS file.
I made a very slight correction that now makes it work.
This is my first contribution on github (and in open source in general) so please be indulgent if it is not done in the rules. Thank you ;)

Signed-off-by: HansGruber51 <122012968+HansGruber51@users.noreply.github.com>
2024-11-30 19:10:53 +01:00
David Bomba 9bec99b7d2
Update README.md
Signed-off-by: David Bomba <turbo124@gmail.com>
2024-11-27 17:27:05 +11:00
David Bomba d325e46ed7
Merge pull request #10282 from turbo124/v5-stable
Update to latest
2024-11-20 15:21:27 +11:00
David Bomba 781e22fe96 merge 2024-11-20 15:19:38 +11:00
David Bomba a148eec09b
Merge pull request #10011 from invoiceninja/revert-9970-blockonomics-driver
Revert "Add Blockonomics payment capabilities"
2024-09-19 08:11:34 +10:00
David Bomba 5cdc036c74
Revert "Add Blockonomics payment capabilities" 2024-09-19 08:11:20 +10:00
David Bomba 8247873fd3
Merge pull request #9970 from cnohall/blockonomics-driver
Add Blockonomics payment capabilities
2024-09-19 08:04:53 +10:00
8 changed files with 8 additions and 72 deletions

View File

@ -25,7 +25,7 @@ namespace App\Models;
* @property bool $is_offsite
* @property bool $is_secure
* @property object|null|string $fields
* @property string|int $default_gateway_type_id
* @property string $default_gateway_type_id
* @property int|null $created_at
* @property int|null $updated_at
* @property-read mixed $options
@ -231,8 +231,8 @@ class Gateway extends StaticModel
return [
GatewayType::CRYPTO => ['refund' => true, 'token_billing' => false, 'webhooks' => ['confirmed', 'paid_out', 'failed', 'fulfilled']],
]; //BTCPay
case 63:
return [
case 63:
return [
GatewayType::BANK_TRANSFER => [
'refund' => false,
'token_billing' => true,

View File

@ -1,45 +0,0 @@
<?php
use Illuminate\Database\Migrations\Migration;
use App\Models\Gateway;
use App\Models\GatewayType;
use Illuminate\Support\Str;
return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
if(!Gateway::find(65))
{
$fields = new \stdClass;
$fields->apiKey = "";
$fields->callbackSecret = "";
$gateway = new Gateway;
$gateway->id = 65;
$gateway->name = 'Blockonomics';
$gateway->key = 'wbhf02us6owgo7p4nfjd0ymssdshks4d';
$gateway->provider = 'Blockonomics';
$gateway->is_offsite = false;
$gateway->fields = \json_encode($fields);
$gateway->visible = true;
$gateway->site_url = 'https://blockonomics.co';
$gateway->default_gateway_type_id = GatewayType::CRYPTO;
$gateway->save();
}
}
/**
* Reverse the migrations.
*/
public function down(): void
{
//
}
};

View File

@ -108,7 +108,7 @@ class PaymentLibrariesSeeder extends Seeder
Gateway::query()->update(['visible' => 0]);
Gateway::whereIn('id', [1, 3, 7, 11, 15, 20, 39, 46, 55, 50, 57, 52, 58, 59, 60, 62, 63, 64, 65])->update(['visible' => 1]);
Gateway::whereIn('id', [1, 3, 7, 11, 15, 20, 39, 46, 55, 50, 57, 52, 58, 59, 60, 62, 63])->update(['visible' => 1]);
if (Ninja::isHosted()) {
Gateway::whereIn('id', [20, 49])->update(['visible' => 0]);

1
public/build/assets/app-02bc3b96.css vendored Normal file

File diff suppressed because one or more lines are too long

1
public/build/assets/app-039bd735.css vendored Normal file

File diff suppressed because one or more lines are too long

View File

@ -385,7 +385,7 @@
"src": "resources/js/setup/setup.js"
},
"resources/sass/app.scss": {
"file": "assets/app-9454bf28.css",
"file": "assets/app-039bd735.css",
"isEntry": true,
"src": "resources/sass/app.scss"
}

View File

@ -104,7 +104,6 @@ use App\Http\Controllers\Reports\ClientReportController;
use App\Http\Controllers\Reports\CreditReportController;
use App\Http\Controllers\Reports\ReportExportController;
use App\Http\Controllers\Reports\VendorReportController;
use App\Http\Controllers\Gateways\BlockonomicsController;
use App\Http\Controllers\Reports\ExpenseReportController;
use App\Http\Controllers\Reports\InvoiceReportController;
use App\Http\Controllers\Reports\PaymentReportController;
@ -500,8 +499,6 @@ Route::post('api/v1/yodlee/balance', [YodleeController::class, 'balanceWebhook']
Route::get('api/v1/protected_download/{hash}', [ProtectedDownloadController::class, 'index'])->name('protected_download')->middleware('throttle:300,1');
Route::post('api/v1/ppcp/webhook', [PayPalPPCPPaymentDriver::class, 'processWebhookRequest'])->middleware('throttle:1000,1');
Route::get('api/v1/get-btc-price', [BlockonomicsController::class, 'getBTCPrice'])->middleware('throttle:1000,1');
Route::get('api/v1/get-blockonomics-qr-code', [BlockonomicsController::class, 'getQRCode'])->middleware('throttle:1000,1');
Route::get('quickbooks/authorize/{token}', [ImportQuickbooksController::class, 'authorizeQuickbooks'])->name('quickbooks.authorize');
Route::get('quickbooks/authorized', [ImportQuickbooksController::class, 'onAuthorized'])->name('quickbooks.authorized');

View File

@ -5622,23 +5622,5 @@
"GET",
"HEAD"
]
},
"generated::Xy7ZkLm8NpQ4Rt5V": {
"name": "generated::Xy7ZkLm8NpQ4Rt5V",
"domain": null,
"action": "App\\Http\\Controllers\\BlockonomicsController@getBTCPrice",
"uri": "api/v1/get-btc-price",
"method": [
"GET"
]
},
"generated::Jk2MnOp3QrS6Tu9W": {
"name": "generated::Jk2MnOp3QrS6Tu9W",
"domain": null,
"action": "App\\Http\\Controllers\\BlockonomicsController@getQRCode",
"uri": "api/v1/get-blockonomics-qr-code",
"method": [
"GET"
]
}
}