Skip to content

Commit 2eed95c

Browse files
committed
Merge branch 'master' of https://github.com/blair2004/NexoPOS-4x into v4.8.x with Pinting
2 parents 0e2b50c + 46bb7fb commit 2eed95c

File tree

120 files changed

+974
-813
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+974
-813
lines changed

.env.example

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,5 @@ MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
4848
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
4949
SANCTUM_STATEFUL_DOMAINS=http://127.0.0.1:8000/,http://localhost/,http://127.0.0.1/
5050
NS_ENV=production
51-
TELESCOPE_ENABLED=false
51+
52+
TELESCOPE_ENABLED=false

app/Console/Commands/ModuleCommandGenerator.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ public function handle()
5050
if ( ! $fileExists || ( $fileExists && $this->option( 'force' ) ) ) {
5151
Storage::disk( 'ns-modules' )->put(
5252
$fileName . '.php', view( 'generate.modules.command', compact(
53-
'modules', 'module', 'name', 'namespace'
54-
) ) );
53+
'modules', 'module', 'name', 'namespace'
54+
) ) );
5555

5656
return $this->info( sprintf(
5757
__( 'The command has been created for the module "%s"!' ),

app/Console/Commands/ModuleController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ public function handle()
7474
if ( ! $fileExists || ( $fileExists && $this->option( 'force' ) ) ) {
7575
Storage::disk( 'ns-modules' )->put(
7676
$fileName . '.php', view( 'generate.modules.controller', compact(
77-
'modules', 'module', 'name', 'namespace'
78-
) ) );
77+
'modules', 'module', 'name', 'namespace'
78+
) ) );
7979

8080
return $this->info( sprintf(
8181
__( 'The controller has been created for the module "%s"!' ),

app/Console/Commands/ModuleDetailsCommand.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ class ModuleDetailsCommand extends Command
2828
*/
2929
public function __construct(
3030
private ModulesService $modulesService
31-
)
32-
{
31+
) {
3332
parent::__construct();
3433
}
3534

app/Console/Commands/ModuleMigrations.php

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -111,13 +111,13 @@ public function passDeleteMigration()
111111
* We'll make sure to clear the migration as
112112
* being executed on the system.
113113
*/
114-
$migration = ModuleMigration::where( 'namespace', $this->module[ 'namespace' ] )
114+
$migration = ModuleMigration::where( 'namespace', $this->module[ 'namespace' ] )
115115
->where( 'file', $path )
116116
->get();
117-
117+
118118
if ( $migration->count() > 0 ) {
119119
$migration->delete();
120-
120+
121121
$this->info( sprintf( 'The migration "%s" for the module %s has been forgotten.', $path, $this->module[ 'name' ] ) );
122122

123123
/**
@@ -127,10 +127,9 @@ public function passDeleteMigration()
127127
Artisan::call( 'cache:clear' );
128128

129129
return true;
130-
131130
} else {
132131
$this->info( sprintf( 'No migration found using the provided file path "%s" for the module "%s".', $path, $this->module[ 'name' ] ) );
133-
132+
134133
return false;
135134
}
136135
}
@@ -150,12 +149,12 @@ public function streamContent( $content )
150149
{
151150
switch ( $content ) {
152151
case 'migration':
153-
return view( 'generate.modules.migration', [
154-
'module' => $this->module,
155-
'migration' => $this->migration,
156-
'table' => $this->table,
157-
'schema' => $this->schema,
158-
]);
152+
return view( 'generate.modules.migration', [
153+
'module' => $this->module,
154+
'migration' => $this->migration,
155+
'table' => $this->table,
156+
'schema' => $this->schema,
157+
]);
159158
}
160159
}
161160

@@ -308,7 +307,6 @@ private function __getMigrationName( $migration )
308307
$shouldIgnore = false;
309308
$details = explode( ' ', $migration );
310309
foreach ( $details as $detail ) {
311-
312310
/**
313311
* while we've not looped the option, we assume the string
314312
* belong to the migration name

app/Console/Commands/ModuleRequest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@ public function streamContent( $content )
6969
{
7070
switch ( $content ) {
7171
case 'migration':
72-
return view( 'generate.modules.request', [
73-
'module' => $this->module,
74-
'name' => $this->argument( 'name' ),
75-
]);
72+
return view( 'generate.modules.request', [
73+
'module' => $this->module,
74+
'name' => $this->argument( 'name' ),
75+
]);
7676
}
7777
}
7878

app/Console/Commands/ModuleSettings.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ public function handle()
6262
if ( ! $fileExists || ( $fileExists && $this->option( 'force' ) ) ) {
6363
$path = Storage::disk( 'ns-modules' )->put(
6464
$fileName . '.php', view( 'generate.modules.settings', compact(
65-
'modules', 'module', 'name', 'namespace'
66-
) ) );
65+
'modules', 'module', 'name', 'namespace'
66+
) ) );
6767

6868
return $this->info( 'The settings has been created !' );
6969
}

app/Console/Commands/ModuleSymlinkCommand.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,18 @@ public function handle()
2323

2424
if ( ! empty( $this->argument( 'namespace' ) ) ) {
2525
$module = $moduleService->get( $this->argument( 'namespace' ) );
26-
26+
2727
if ( $module ) {
2828
$moduleService->createSymLink( $this->argument( 'namespace' ) );
2929

3030
$this->newLine();
31-
31+
3232
return $this->info( sprintf( 'The symbolink directory has been created/refreshed for the module "%s".', $module[ 'name' ] ) );
3333
}
34-
34+
3535
$this->error( sprintf( 'Unable to find the module "%s".', $this->argument( 'namespace' ) ) );
3636
} else {
37-
$modules = $moduleService->get();
37+
$modules = $moduleService->get();
3838

3939
$this->withProgressBar( $modules, function( $module ) use ( $moduleService ) {
4040
$moduleService->createSymLink( $module[ 'namespace' ] );

app/Console/Commands/ProductCommand.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public function handle()
5656

5757
match ( $this->argument( 'action' ) ) {
5858
'update' => $this->updateProducts(),
59-
'compute-taxes' => $this->computeTaxes(),
59+
'compute-taxes' => $this->computeTaxes(),
6060
'refresh-barcode' => $this->refreshBarcodes()
6161
};
6262
}
@@ -66,11 +66,11 @@ private function computeTaxes()
6666
/**
6767
* @var TaxService
6868
*/
69-
$taxService = app()->make( TaxService::class );
69+
$taxService = app()->make( TaxService::class );
7070

71-
$this->withProgressBar( ProductUnitQuantity::with( 'product.tax_group' )->get(), function( ProductUnitQuantity $productUnitQuantity ) use ( $taxService ) {
72-
$taxService->computeTax(
73-
product: $productUnitQuantity,
71+
$this->withProgressBar( ProductUnitQuantity::with( 'product.tax_group' )->get(), function( ProductUnitQuantity $productUnitQuantity ) use ( $taxService ) {
72+
$taxService->computeTax(
73+
product: $productUnitQuantity,
7474
tax_group_id: $productUnitQuantity->product->tax_group_id,
7575
tax_type: $productUnitQuantity->product->tax_type
7676
);

app/Console/Commands/ResetCommand.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ public function handle()
6161
switch ( $this->option( 'mode' ) ) {
6262
case 'soft':
6363
return $this->softReset();
64-
break;
64+
break;
6565
case 'hard':
6666
return $this->hardReset();
67-
break;
67+
break;
6868
case 'grocery':
6969
$this->softReset();
7070
$this->initializeRole();
@@ -74,7 +74,7 @@ public function handle()
7474
'create_procurements' => true,
7575
]);
7676
$this->info( __( 'The demo has been enabled.' ) );
77-
break;
77+
break;
7878
}
7979
}
8080

0 commit comments

Comments
 (0)