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

Merge pull request #9498 from turbo124/v5-develop

Browse Source 
v5.8.53
This commit is contained in:
David Bomba 2024-05-03 08:20:39 +10:00 committed by GitHub
commit ac7d8b40fa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 15 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.8.52
5.8.53

2
app/Livewire/BillingPortal/Authentication/ClientRegisterService.php
View File

@ -43,7 +43,7 @@ class ClientRegisterService
foreach ($rules as $field => $properties) {
if ($field === 'email') {
$rules[$field] = array_merge($rules[$field], ['email:rfc,dns', 'max:191', Rule::unique('client_contacts')->where('company_id', $this->company->id)]);
$rules[$field] = array_merge($rules[$field], ['email:rfc', 'max:191', Rule::unique('client_contacts')->where('company_id', $this->company->id)]);
}
if ($field === 'current_password' || $field === 'password') {

7
app/Livewire/BillingPortal/Authentication/Register.php
View File

@ -59,6 +59,8 @@ class Register extends Component
public function register(array $data)
{
nlog($data);
$service = new ClientRegisterService(
company: $this->subscription->company,
additional: $this->additional_fields,
@ -66,8 +68,13 @@ class Register extends Component
$rules = $service->rules();
nlog($rules);
$data = Validator::make($data, $rules)->validate();
nlog("validated data");
nlog($data);
$client = $service->createClient($data);
$contact = $service->createClientContact($data, $client);

5
app/PaymentDrivers/PayPalRestPaymentDriver.php
View File

@ -244,7 +244,8 @@ return render('gateways.paypal.pay', $data);
nlog("post order creation");
nlog($orderId);
$r = $this->gatewayRequest("/v2/checkout/orders/{$orderId}", 'get', ['body' => '']);
$r = $this->gatewayRequest("/v2/checkout/orders/{$orderId}", 'get', ['body' => '']);
nlog($r);
$response = $r->json();
@ -400,7 +401,7 @@ return render('gateways.paypal.pay', $data);
$data['token'] = $token;
$data['payment_method_id'] = GatewayType::PAYPAL_ADVANCED_CARDS;
$data['payment_meta'] = $payment_meta;
$data['payment_method_id'] = GatewayType::CREDIT_CARD;
// $data['payment_method_id'] = GatewayType::CREDIT_CARD;
$additional['gateway_customer_reference'] = $gateway_customer_reference;

5
app/Services/ClientPortal/InstantPayment.php
View File

@ -208,11 +208,6 @@ class InstantPayment
$credit_totals = in_array($first_invoice->client->getSetting('use_credits_payment'), ['always', 'option']) ? $first_invoice->client->service()->getCreditBalance() : 0;
$starting_invoice_amount = $first_invoice->balance;
/* Schedule a job to check the gateway fees for this invoice*/
// if (Ninja::isHosted()) {
// CheckGatewayFee::dispatch($first_invoice->id, $client->company->db)->delay(800);
// }
if ($gateway) {
$first_invoice->service()->addGatewayFee($gateway, $payment_method_id, $invoice_totals)->save();
}

4
config/ninja.php
View File

@ -17,8 +17,8 @@ return [
'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
'app_version' => env('APP_VERSION', '5.8.52'),
'app_tag' => env('APP_TAG', '5.8.52'),
'app_version' => env('APP_VERSION', '5.8.53'),
'app_tag' => env('APP_TAG', '5.8.53'),
'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', false),

17
resources/views/portal/ninja2020/gateways/paypal/ppcp/card.blade.php
View File

@ -97,17 +97,11 @@
if(liabilityShift) {
/* Handle liability shift. More information in 3D Secure response parameters */
console.log("inside liability shift")
console.log(liabilityShift)
console.log(orderID);
console.log(data);
//doesn't really do anything as failure is linked in SUBMIT. We only hit here after a successful return
//and where SCA is optional?
if(liabilityShift == 'NO') {
document.getElementById('errors').textContent = `Sorry, your transaction could not be processed, Please try a different payment method.`;
document.getElementById('errors').hidden = false;
return;
}
@ -118,9 +112,6 @@
return actions.restart();
}
// console.log("on approve");
// console.log(data);
// console.log(actions);
let storeCard = document.querySelector('input[name=token-billing-checkbox]:checked');
if (storeCard) {
@ -182,7 +173,6 @@
expiryField.render("#card-expiry-field-container");
document.getElementById("pay-now").addEventListener('click', (e) => {
console.log("paynow");
document.getElementById('errors').textContent = '';
document.getElementById('errors').hidden = true;
@ -196,14 +186,9 @@
document.querySelector('#pay-now > span').classList.add('hidden');
cardField.submit().then((response) => {
console.log("then");
console.log(response);
}).catch((error) => {
// console.log("catch error")
// console.log(error);
document.getElementById('pay-now').disabled = false;
document.querySelector('#pay-now > svg').classList.add('hidden');
document.querySelector('#pay-now > span').classList.remove('hidden');