Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-04 05:14:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

minor fixes

Browse Source
This commit is contained in:
David Bomba 2024-04-24 09:21:00 +10:00
parent 402ac09c22
commit 0bd5a9db0c
5 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Export/CSV/ClientExport.php
View File

@ -178,14 +178,10 @@ class ClientExport extends BaseExport
} elseif (is_array($parts) && $parts[0] == 'contact' && array_key_exists($parts[1], $transformed_contact)) { } elseif (is_array($parts) && $parts[0] == 'contact' && array_key_exists($parts[1], $transformed_contact)) {
$entity[$key] = $transformed_contact[$parts[1]]; $entity[$key] = $transformed_contact[$parts[1]];
} else { } else {
// nlog($key);
$entity[$key] = $this->decorator->transform($key, $client); $entity[$key] = $this->decorator->transform($key, $client);
// $entity[$key] = '';
} }
} }
// return $entity;
return $this->decorateAdvancedFields($client, $entity); return $this->decorateAdvancedFields($client, $entity);
} }
@ -233,11 +229,11 @@ class ClientExport extends BaseExport
} }
if (in_array('client.country_id', $this->input['report_keys']) && isset($client->country_id)) { if (in_array('client.country_id', $this->input['report_keys']) && isset($client->country_id)) {
$entity['client.country_id'] = $client->country->full_name; $entity['client.country_id'] = $client->country ? $client->country->full_name : '';
} }
if (in_array('client.shipping_country_id', $this->input['report_keys']) && isset($client->shipping_country_id)) { if (in_array('client.shipping_country_id', $this->input['report_keys']) && isset($client->shipping_country_id)) {
$entity['client.shipping_country_id'] = $client->shipping_country->full_name; $entity['client.shipping_country_id'] = $client->shipping_country ? $client->shipping_country->full_name : '';
} }
return $entity; return $entity;

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

@ -276,7 +276,7 @@ class BaseController extends Controller
/** /**
* API Error response. * API Error response.
* *
* @param string $message The return error message * @param string|array $message The return error message
* @param int $httpErrorCode 404/401/403 etc * @param int $httpErrorCode 404/401/403 etc
* @return Response The JSON response * @return Response The JSON response
* @throws BindingResolutionException * @throws BindingResolutionException

1
app/Http/Controllers/CompanyGatewayController.php
View File

@ -565,7 +565,6 @@ class CompanyGatewayController extends BaseController
public function importCustomers(TestCompanyGatewayRequest $request, CompanyGateway $company_gateway) public function importCustomers(TestCompanyGatewayRequest $request, CompanyGateway $company_gateway)
{ {
// $x = Cache::pull("throttle_polling:import_customers:{$company_gateway->company->company_key}:{$company_gateway->hashed_id}");
//Throttle here //Throttle here
if (Cache::has("throttle_polling:import_customers:{$company_gateway->company->company_key}:{$company_gateway->hashed_id}")) if (Cache::has("throttle_polling:import_customers:{$company_gateway->company->company_key}:{$company_gateway->hashed_id}"))

2
app/Models/BaseModel.php
View File

@ -209,7 +209,7 @@ class BaseModel extends Model
* Retrieve the model for a bound value. * Retrieve the model for a bound value.
* *
* @param mixed $value * @param mixed $value
* @param null $field * @param mixed $field
* @return Model|null * @return Model|null
*/ */
public function resolveRouteBinding($value, $field = null) public function resolveRouteBinding($value, $field = null)

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

@ -97,10 +97,10 @@
if(liabilityShift) { if(liabilityShift) {
/* Handle liability shift. More information in 3D Secure response parameters */ /* Handle liability shift. More information in 3D Secure response parameters */
// console.log("inside liability shift") console.log("inside liability shift")
// console.log(liabilityShift) console.log(liabilityShift)
// console.log(orderID); console.log(orderID);
// console.log(data); console.log(data);
//doesn't really do anything as failure is linked in SUBMIT. We only hit here after a successful return //doesn't really do anything as failure is linked in SUBMIT. We only hit here after a successful return
//and where SCA is optional? //and where SCA is optional?
@ -175,7 +175,7 @@
expiryField.render("#card-expiry-field-container"); expiryField.render("#card-expiry-field-container");
document.getElementById("pay-now").addEventListener('click', (e) => { document.getElementById("pay-now").addEventListener('click', (e) => {
console.log("paynow");
document.getElementById('errors').textContent = ''; document.getElementById('errors').textContent = '';
document.getElementById('errors').hidden = true; document.getElementById('errors').hidden = true;
@ -189,8 +189,8 @@
document.querySelector('#pay-now > span').classList.add('hidden'); document.querySelector('#pay-now > span').classList.add('hidden');
cardField.submit().then((response) => { cardField.submit().then((response) => {
// console.log("then"); console.log("then");
// console.log(response); console.log(response);
}).catch((error) => { }).catch((error) => {