Skip to content

Commit

Permalink
Changelog:
Browse files Browse the repository at this point in the history
- Fix: typos
  • Loading branch information
Blair2004 committed Feb 27, 2023
1 parent a0bdf12 commit 240167d
Show file tree
Hide file tree
Showing 139 changed files with 4,074 additions and 1,714 deletions.
2 changes: 1 addition & 1 deletion SECURITY.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Guideline For Reporting Vulnerability
First of all, thank you for taking time to read this. We believe, you're considering sharing what could be a security issue that might affect every installation running NexoPOS 4.x.
We believe in the power of open-source and contributions of it's adherants, that's why regardless of wether your report is proven or not, it's welcome.
We believe in the power of open-source and contributions of it's adherants, that's why regardless of whether your report is proven or not, it's welcome.

# What Can Be Reported ?
Basically, everything that could be a leak, that makes the system's (NexoPOS) security inefficient, anything that can expose the server (files & database) or that makes the system to be used in a manner that is out of the purpose we're aiming.
Expand Down
2 changes: 1 addition & 1 deletion app/Console/Commands/CrudGeneratorCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ public function askRelation( $fresh = true )
$parameters = explode( ',', $name );

if ( count( $parameters ) != 3 ) {
$this->error( __( 'No enough paramters provided for the relation.' ) );
$this->error( __( 'Not enough parameters provided for the relation.' ) );

return $this->askRelation(false);
}
Expand Down
2 changes: 1 addition & 1 deletion app/Console/Commands/DoctorCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public function handle()

$this->newLine();

$this->info( 'The products were succesfully updated' );
$this->info( 'The products were successfully updated' );
}
}
}
2 changes: 1 addition & 1 deletion app/Console/Commands/ProductCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ private function updateProducts()
$this->newLine();

return $this->info( sprintf(
__( '%s prodcuts where updated.' ),
__( '%s products where updated.' ),
$queryBuilder->count()
) );
}
Expand Down
2 changes: 1 addition & 1 deletion app/Crud/CashFlowHistoryCrud.php
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class CashFlowHistoryCrud extends CrudService

/**
* Pick
* Restrict columns you retreive from relation.
* Restrict columns you retrieve from relation.
* Should be an array of associative keys, where
* keys are either the related table or alias name.
* Example : [
Expand Down
2 changes: 1 addition & 1 deletion app/Crud/CouponCrud.php
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ class CouponCrud extends CrudService

/**
* Pick
* Restrict columns you retreive from relation.
* Restrict columns you retrieve from relation.
* Should be an array of associative keys, where
* keys are either the related table or alias name.
* Example : [
Expand Down
2 changes: 1 addition & 1 deletion app/Crud/CustomerAccountCrud.php
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ class CustomerAccountCrud extends CrudService

/**
* Pick
* Restrict columns you retreive from relation.
* Restrict columns you retrieve from relation.
* Should be an array of associative keys, where
* keys are either the related table or alias name.
* Example : [
Expand Down
2 changes: 1 addition & 1 deletion app/Crud/CustomerCouponCrud.php
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class CustomerCouponCrud extends CrudService

/**
* Pick
* Restrict columns you retreive from relation.
* Restrict columns you retrieve from relation.
* Should be an array of associative keys, where
* keys are either the related table or alias name.
* Example : [
Expand Down
2 changes: 1 addition & 1 deletion app/Crud/CustomerRewardCrud.php
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class CustomerRewardCrud extends CrudService

/**
* Pick
* Restrict columns you retreive from relation.
* Restrict columns you retrieve from relation.
* Should be an array of associative keys, where
* keys are either the related table or alias name.
* Example : [
Expand Down
12 changes: 6 additions & 6 deletions app/Crud/ExpenseCrud.php
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ public function getForm( $entry = null )
'options' => Helper::kvToJsOptions([ __( 'No' ), __( 'Yes' ) ]),
'name' => 'active',
'label' => __( 'Active' ),
'description' => __( 'determine if the expense is effective or not. Work for recurring and not reccuring expenses.' ),
'description' => __( 'determine if the expense is effective or not. Work for recurring and not recurring expenses.' ),
'validation' => 'required',
'value' => $entry->active ?? '',
], [
Expand Down Expand Up @@ -189,7 +189,7 @@ public function getForm( $entry = null )
], [
'type' => 'switch',
'name' => 'recurring',
'description' => __( 'If set to Yes, the expense will trigger on defined occurence.' ),
'description' => __( 'If set to Yes, the expense will trigger on defined occurrence.' ),
'label' => __( 'Recurring' ),
'validation' => 'required',
'options' => [
Expand Down Expand Up @@ -223,13 +223,13 @@ public function getForm( $entry = null )
],
],
'name' => 'occurence',
'label' => __( 'Occurence' ),
'label' => __( 'Occurrence' ),
'description' => __( 'Define how often this expenses occurs' ),
'value' => $entry->occurence ?? '',
], [
'type' => 'text',
'name' => 'occurence_value',
'label' => __( 'Occurence Value' ),
'label' => __( 'Occurrence Value' ),
'description' => __( 'Must be used in case of X days after month starts and X days before month ends.' ),
'value' => $entry->occurence_value ?? '',
], [
Expand Down Expand Up @@ -407,7 +407,7 @@ public function getColumns()
'$sort' => false,
],
'occurence' => [
'label' => __( 'Occurence' ),
'label' => __( 'Occurrence' ),
'$direction' => '',
'$sort' => false,
],
Expand Down Expand Up @@ -443,7 +443,7 @@ public function setActions( CrudEntry $entry, $namespace )
break;
case 'x_before_month_ends' : $entry->occurence = __( 'X Days Before Month Ends' );
break;
default: $entry->occurence = __( 'Unknown Occurance' );
default: $entry->occurence = __( 'Unknown Occurrence' );
break;
}

Expand Down
2 changes: 1 addition & 1 deletion app/Crud/GlobalProductHistoryCrud.php
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ class GlobalProductHistoryCrud extends CrudService

/**
* Pick
* Restrict columns you retreive from relation.
* Restrict columns you retrieve from relation.
* Should be an array of associative keys, where
* keys are either the related table or alias name.
* Example : [
Expand Down
4 changes: 2 additions & 2 deletions app/Crud/HoldOrderCrud.php
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class HoldOrderCrud extends CrudService

/**
* Pick
* Restrict columns you retreive from relation.
* Restrict columns you retrieve from relation.
* Should be an array of associative keys, where
* keys are either the related table or alias name.
* Example : [
Expand Down Expand Up @@ -249,7 +249,7 @@ public function getForm( $entry = null )
], [
'type' => 'text',
'name' => 'process_status',
'label' => __( 'Process Statuss' ),
'label' => __( 'Process Status' ),
'value' => $entry->process_status ?? '',
], [
'type' => 'text',
Expand Down
2 changes: 1 addition & 1 deletion app/Crud/OrderInstalmentCrud.php
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ class OrderInstalmentCrud extends CrudService

/**
* Pick
* Restrict columns you retreive from relation.
* Restrict columns you retrieve from relation.
* Should be an array of associative keys, where
* keys are either the related table or alias name.
* Example : [
Expand Down
2 changes: 1 addition & 1 deletion app/Crud/PaymentTypeCrud.php
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ class PaymentTypeCrud extends CrudService

/**
* Pick
* Restrict columns you retreive from relation.
* Restrict columns you retrieve from relation.
* Should be an array of associative keys, where
* keys are either the related table or alias name.
* Example : [
Expand Down
2 changes: 1 addition & 1 deletion app/Crud/ProcurementProductCrud.php
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class ProcurementProductCrud extends CrudService

/**
* Pick
* Restrict columns you retreive from relation.
* Restrict columns you retrieve from relation.
* Should be an array of associative keys, where
* keys are either the related table or alias name.
* Example : [
Expand Down
6 changes: 3 additions & 3 deletions app/Crud/ProductCrud.php
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ public function getForm( $entry = null )
'available' => __( 'On Sale' ),
'unavailable' => __( 'Hidden' ),
]),
'description' => __( 'Define wether the product is available for sale.' ),
'description' => __( 'Define whether the product is available for sale.' ),
'name' => 'status',
'validation' => 'required',
'label' => __( 'Status' ),
Expand Down Expand Up @@ -474,7 +474,7 @@ public function getForm( $entry = null )
'name' => 'featured',
'options' => Helper::kvToJsOptions([ __( 'No' ), __( 'Yes' ) ]),
'label' => __( 'Is Primary' ),
'description' => __( 'Define wether the image should be primary. If there are more than one primary image, one will be choosed for you.' ),
'description' => __( 'Define whether the image should be primary. If there are more than one primary image, one will be chosen for you.' ),
],
],
'groups' => $entry ? $entry->galleries->map( function( $gallery ) {
Expand All @@ -491,7 +491,7 @@ public function getForm( $entry = null )
'options' => Helper::kvToJsOptions([ __( 'No' ), __( 'Yes' ) ]),
'label' => __( 'Is Primary' ),
'value' => (int) $gallery->featured,
'description' => __( 'Define wether the image should be primary. If there are more than one primary image, one will be choosed for you.' ),
'description' => __( 'Define whether the image should be primary. If there are more than one primary image, one will be chosen for you.' ),
],
];
}) : [],
Expand Down
2 changes: 1 addition & 1 deletion app/Crud/ProductHistoryCrud.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class ProductHistoryCrud extends CrudService

/**
* Pick
* Restrict columns you retreive from relation.
* Restrict columns you retrieve from relation.
* Should be an array of associative keys, where
* keys are either the related table or alias name.
* Example : [
Expand Down
2 changes: 1 addition & 1 deletion app/Crud/ProductUnitQuantitiesCrud.php
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class ProductUnitQuantitiesCrud extends CrudService

/**
* Pick
* Restrict columns you retreive from relation.
* Restrict columns you retrieve from relation.
* Should be an array of associative keys, where
* keys are either the related table or alias name.
* Example : [
Expand Down
4 changes: 2 additions & 2 deletions app/Crud/ProviderCrud.php
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ public function getForm( $entry = null )
'type' => 'text',
'name' => 'email',
'label' => __( 'Email' ),
'description' => __( 'Provide the provider email. Mightbe used to send automatted email.' ),
'description' => __( 'Provide the provider email. Might be used to send automated email.' ),
'value' => $entry->email ?? '',
], [
'type' => 'text',
Expand All @@ -151,7 +151,7 @@ public function getForm( $entry = null )
'type' => 'text',
'name' => 'phone',
'label' => __( 'Phone' ),
'description' => __( 'Contact phone number for the provider. Might be used to send automatted SMS notifications.' ),
'description' => __( 'Contact phone number for the provider. Might be used to send automated SMS notifications.' ),
'value' => $entry->phone ?? '',
], [
'type' => 'text',
Expand Down
2 changes: 1 addition & 1 deletion app/Crud/ProviderProcurementsCrud.php
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ class ProviderProcurementsCrud extends CrudService

/**
* Pick
* Restrict columns you retreive from relation.
* Restrict columns you retrieve from relation.
* Should be an array of associative keys, where
* keys are either the related table or alias name.
* Example : [
Expand Down
2 changes: 1 addition & 1 deletion app/Crud/ProviderProductsCrud.php
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class ProviderProductsCrud extends CrudService

/**
* Pick
* Restrict columns you retreive from relation.
* Restrict columns you retrieve from relation.
* Should be an array of associative keys, where
* keys are either the related table or alias name.
* Example : [
Expand Down
2 changes: 1 addition & 1 deletion app/Crud/RegisterCrud.php
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class RegisterCrud extends CrudService

/**
* Pick
* Restrict columns you retreive from relation.
* Restrict columns you retrieve from relation.
* Should be an array of associative keys, where
* keys are either the related table or alias name.
* Example : [
Expand Down
2 changes: 1 addition & 1 deletion app/Crud/RegisterHistoryCrud.php
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class RegisterHistoryCrud extends CrudService

/**
* Pick
* Restrict columns you retreive from relation.
* Restrict columns you retrieve from relation.
* Should be an array of associative keys, where
* keys are either the related table or alias name.
* Example : [
Expand Down
6 changes: 3 additions & 3 deletions app/Crud/RolesCrud.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class RolesCrud extends CrudService

/**
* Pick
* Restrict columns you retreive from relation.
* Restrict columns you retrieve from relation.
* Should be an array of associative keys, where
* keys are either the related table or alias name.
* Example : [
Expand Down Expand Up @@ -190,7 +190,7 @@ public function getForm( $entry = null )
public function filterPostInputs( $inputs )
{
/**
* the namespace can be automatted
* the namespace can be automated
*/
if ( empty( $inputs[ 'namespace' ] ) ) {
$inputs[ 'namespace' ] = Str::slug( $inputs[ 'name' ] );
Expand Down Expand Up @@ -230,7 +230,7 @@ public function filterPutInputs( $inputs, Role $entry )
}

/**
* the namespace can be automatted
* the namespace can be automated
*/
if ( empty( $inputs[ 'namespace' ] ) && ! $entry->locked ) {
$inputs[ 'namespace' ] = Str::slug( $inputs[ 'name' ] );
Expand Down
2 changes: 1 addition & 1 deletion app/Crud/TaxCrud.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class TaxCrud extends CrudService

/**
* Pick
* Restrict columns you retreive from relation.
* Restrict columns you retrieve from relation.
* Should be an array of associative keys, where
* keys are either the related table or alias name.
* Example : [
Expand Down
2 changes: 1 addition & 1 deletion app/Crud/UserCrud.php
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ public function getForm( $entry = null )
'options' => Helper::kvToJsOptions([ __( 'No' ), __( 'Yes' ) ]),
'name' => 'active',
'label' => __( 'Active' ),
'description' => __( 'Define wether the user can use the application.' ),
'description' => __( 'Define whether the user can use the application.' ),
'value' => ( $entry !== null && $entry->active ? 1 : 0 ) ?? 0,
], [
'type' => 'multiselect',
Expand Down
2 changes: 1 addition & 1 deletion app/Exceptions/ValidationException.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public function render( $request )
{
if ( ! $request->expectsJson() ) {
return response()->view( 'pages.errors.not-allowed', [
'title' => __( 'An error has occured' ),
'title' => __( 'An error has occurred' ),
'message' => __( 'Unable to proceed, the submitted form is not valid.' ),
]);
}
Expand Down
2 changes: 1 addition & 1 deletion app/Forms/pos/billing.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
'name' => '_use_customer_billing',
'label' => __( 'Use Customer Billing' ),
'options' => Helper::kvToJsOptions([ __( 'No' ), __( 'Yes' ) ]),
'description' => __( 'Define wether the customer billing information should be used.' ),
'description' => __( 'Define whether the customer billing information should be used.' ),
],
...( new CustomerCrud )->getForm()[ 'tabs' ][ 'billing' ][ 'fields' ],
],
Expand Down
2 changes: 1 addition & 1 deletion app/Forms/pos/shipping.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
'name' => '_use_customer_shipping',
'label' => __( 'Use Customer Shipping' ),
'options' => Helper::kvToJsOptions([ __( 'No' ), __( 'Yes' ) ]),
'description' => __( 'Define wether the customer shipping information should be used.' ),
'description' => __( 'Define whether the customer shipping information should be used.' ),
],
...( new CustomerCrud )->getForm()[ 'tabs' ][ 'shipping' ][ 'fields' ],
],
Expand Down
6 changes: 3 additions & 3 deletions app/Http/Controllers/Dashboard/CrudController.php
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ public function crudGet( string $namespace, Request $request )
$crudClass = Hook::filter( 'ns-crud-resource', $namespace );

/**
* Let's check it the resource has a method to retreive an item
* Let's check it the resource has a method to retrieve an item
*
* @var CrudService
*/
Expand All @@ -201,7 +201,7 @@ public function crudGet( string $namespace, Request $request )
if ( method_exists( $resource, 'getEntries' ) ) {
return $resource->getEntries( $request );
} else {
throw new Exception( __( 'Unable to retreive items. The current CRUD resource doesn\'t implement "getEntries" methods' ) );
throw new Exception( __( 'Unable to retrieve items. The current CRUD resource doesn\'t implement "getEntries" methods' ) );
}
}

Expand Down Expand Up @@ -407,7 +407,7 @@ public function exportCrud( $namespace, Request $request )

/**
* Can Access
* Check wether the logged user has
* Check whether the logged user has
* the right to access to the requested resource
*
* @return AsyncResponse
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/Dashboard/CustomersController.php
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public function get( $customer_id = null )
return $customer;
}

throw new NotFoundException( __( 'The requested customer cannot be fonud.' ) );
throw new NotFoundException( __( 'The requested customer cannot be found.' ) );
}

return $this->customerService->get();
Expand Down
Loading

0 comments on commit 240167d

Please sign in to comment.