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

Adjustments for default quantities

Browse Source
This commit is contained in:
David Bomba 2023-12-12 14:46:08 +11:00
parent 46eb525189
commit 820c76ea4d
5 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Http/Requests/Product/StoreProductRequest.php
View File

@ -23,7 +23,10 @@ class StoreProductRequest extends Request
*/
public function authorize() : bool
{
return auth()->user()->can('create', Product::class);
/** @var \App\Models\User $user */
$user = auth()->user();
return $user->can('create', Product::class);
}
public function rules()
@ -54,7 +57,7 @@ class StoreProductRequest extends Request
{
$input = $this->all();
if (! isset($input['quantity']) || $input['quantity'] < 1) {
if (! isset($input['quantity'])) {
$input['quantity'] = 1;
}

2
app/Http/Requests/Product/UpdateProductRequest.php
View File

@ -56,7 +56,7 @@ class UpdateProductRequest extends Request
{
$input = $this->all();
if (! isset($input['quantity']) || $input['quantity'] < 1) {
if (! isset($input['quantity'])) {
$input['quantity'] = 1;
}

2
app/Transformers/ProductTransformer.php
View File

@ -74,7 +74,7 @@ class ProductTransformer extends EntityTransformer
'notes' => $product->notes ?: '',
'cost' => (float) $product->cost ?: 0,
'price' => (float) $product->price ?: 0,
'quantity' => (float) $product->quantity ?: 1.0,
'quantity' => (float) is_numeric($product->quantity) ? $product->quantity : 1.0,
'tax_name1' => $product->tax_name1 ?: '',
'tax_rate1' => (float) $product->tax_rate1 ?: 0,
'tax_name2' => $product->tax_name2 ?: '',

3
resources/views/portal/ninja2020/gateways/paypal/pay.blade.php
View File

@ -28,12 +28,13 @@
@endsection
@push('footer')
<script src="https://www.paypal.com/sdk/js?enable-funding={!! $funding_options !!}&disable-funding=credit&components=buttons,hosted-fields,funding-eligibility&intent=capture&client-id={!! $client_id !!}" data-client-token="{!! $token !!}">
<script src="https://www.paypal.com/sdk/js?enable-funding={!! $funding_options !!}&disable-funding=credit&components=buttons,hosted-fields,funding-eligibility&intent=capture&client-id={!! $client_id !!}&buyer-country=US&currency=USD" data-client-token="{!! $token !!}">
</script>
<script>
paypal.Buttons({
fundingSource: "{{ $funding_options }}",
env: "{{ $gateway->company_gateway->getConfigField('testMode') ? 'sandbox' : 'production' }}",
client: {
@if($gateway->company_gateway->getConfigField('testMode'))

2
resources/views/portal/ninja2020/gateways/paypal/ppcp/pay.blade.php
View File

@ -30,7 +30,7 @@
@push('footer')
<script src="https://www.paypal.com/sdk/js?client-id={!! $client_id !!}&currency={!! $currency !!}&merchant-id={!! $merchantId !!}&components=buttons,funding-eligibility&intent=capture" data-partner-attribution-id="invoiceninja_SP_PPCP"></script>
<script src="https://www.paypal.com/sdk/js?client-id={!! $client_id !!}&currency={!! $currency !!}&merchant-id={!! $merchantId !!}&components=buttons,funding-eligibility&intent=capture&enable-funding={!! $funding_source !!}" data-partner-attribution-id="invoiceninja_SP_PPCP"></script>
<div id="paypal-button-container"></div>
<script>