Skip to content

Commit b3c1914

Browse files
NeoRazorXNeoRazorX
authored
Merge pull request #22 from Pabloferrandezroca/actualizarPlugin
pluginActualizado
2 parents 70e1fe9 + 8327163 commit b3c1914

12 files changed

Lines changed: 92 additions & 72 deletions

File tree

‎Controller/Modelo347.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ protected function getCustomersDataAccounting(): array
323323
// buscamos el cliente de la subcuenta
324324
$cliente = new Cliente();
325325
$where = [new DataBaseWhere('codsubcuenta', $row['codsubcuenta'])];
326-
if (false === $cliente->loadFromCode('', $where)) {
326+
if (false === $cliente->loadWhere($where)) {
327327
// no se ha encontrado el cliente, saltamos
328328
continue;
329329
}
@@ -389,7 +389,7 @@ protected function getCustomersDataInvoices(): array
389389
];
390390

391391
$cliente = new Cliente();
392-
if ($cliente->loadFromCode($codcliente)) {
392+
if ($cliente->load($codcliente)) {
393393
$dir = $cliente->getDefaultAddress();
394394
$items[$codcliente]['cifnif'] = $cliente->cifnif;
395395
$items[$codcliente]['cliente'] = $cliente->razonsocial;
@@ -457,7 +457,7 @@ protected function getSuppliersDataAccounting(): array
457457
// buscamos el proveedor de la subcuenta
458458
$proveedor = new Proveedor();
459459
$where = [new DataBaseWhere('codsubcuenta', $row['codsubcuenta'])];
460-
if (false === $proveedor->loadFromCode('', $where)) {
460+
if (false === $proveedor->loadWhere($where)) {
461461
// no existe, saltamos
462462
continue;
463463
}
@@ -524,7 +524,7 @@ protected function getSuppliersDataInvoices(): array
524524
];
525525

526526
$proveedor = new Proveedor();
527-
if ($proveedor->loadFromCode($codproveedor)) {
527+
if ($proveedor->load($codproveedor)) {
528528
$dir = $proveedor->getDefaultAddress();
529529
$items[$codproveedor]['cifnif'] = $proveedor->cifnif;
530530
$items[$codproveedor]['proveedor'] = $proveedor->razonsocial;

‎Extension/Model/Cliente.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
*/
1919
namespace FacturaScripts\Plugins\Modelo347\Extension\Model;
2020

21+
use FacturaScripts\Core\Tools;
22+
23+
2124
use Closure;
2225

2326
/**

‎Extension/Model/FacturaCliente.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
*/
1919
namespace FacturaScripts\Plugins\Modelo347\Extension\Model;
2020

21+
use FacturaScripts\Core\Tools;
22+
23+
2124
use Closure;
2225

2326
/**

‎Extension/Model/FacturaProveedor.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
*/
1919
namespace FacturaScripts\Plugins\Modelo347\Extension\Model;
2020

21+
use FacturaScripts\Core\Tools;
22+
23+
2124
use Closure;
2225

2326
/**

‎Extension/Model/Proveedor.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
*/
1919
namespace FacturaScripts\Plugins\Modelo347\Extension\Model;
2020

21+
use FacturaScripts\Core\Tools;
22+
23+
2124
use Closure;
2225

2326
/**

‎Init.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@
1919

2020
namespace FacturaScripts\Plugins\Modelo347;
2121

22-
use FacturaScripts\Core\Base\AjaxForms\PurchasesHeaderHTML;
23-
use FacturaScripts\Core\Base\AjaxForms\SalesHeaderHTML;
22+
use FacturaScripts\Core\Lib\AjaxForms\PurchasesHeaderHTML;
23+
use FacturaScripts\Core\Lib\AjaxForms\SalesHeaderHTML;
2424
use FacturaScripts\Core\Template\InitClass;
25+
use FacturaScripts\Core\Tools;
26+
2527
use FacturaScripts\Dinamic\Model\FacturaCliente;
2628
use FacturaScripts\Dinamic\Model\FacturaProveedor;
2729
use FacturaScripts\Dinamic\Model\User;

‎Lib/Txt347Export.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ protected static function formatString(string $string, int $length, string $char
9898
protected static function loadCompany(): void
9999
{
100100
self::$company = new Empresa();
101-
self::$company->loadFromCode(self::$exercise->idempresa);
101+
self::$company->load(self::$exercise->idempresa);
102102
}
103103

104104
protected static function getCompanyData(): string
@@ -175,13 +175,13 @@ protected static function getDecimal($number): int
175175
protected static function loadExercise(string $codejercicio): void
176176
{
177177
self::$exercise = new Ejercicio();
178-
self::$exercise->loadFromCode($codejercicio);
178+
self::$exercise->load($codejercicio);
179179
}
180180

181181
protected static function getPais(string $codpais): string
182182
{
183183
$paisModel = new Pais();
184-
if ($paisModel->loadFromCode($codpais) && $paisModel->codiso !== 'ES') {
184+
if ($paisModel->load($codpais) && $paisModel->codiso !== 'ES') {
185185
return self::formatString($paisModel->codiso, 2, '', STR_PAD_LEFT);
186186
}
187187

‎Mod/PurchasesHeaderHTMLMod.php‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,12 @@
1919

2020
namespace FacturaScripts\Plugins\Modelo347\Mod;
2121

22-
use FacturaScripts\Core\Base\Contract\PurchasesModInterface;
23-
use FacturaScripts\Core\Base\Translator;
22+
use FacturaScripts\Core\Contract\PurchasesModInterface;
23+
use FacturaScripts\Core\Translator;
2424
use FacturaScripts\Core\Model\Base\PurchaseDocument;
2525
use FacturaScripts\Core\Model\User;
26+
use FacturaScripts\Core\Tools;
27+
2628

2729
/**
2830
* Add new fields in the modal window of the document header
@@ -33,14 +35,14 @@
3335
*/
3436
class PurchasesHeaderHTMLMod implements PurchasesModInterface
3537
{
36-
public function apply(PurchaseDocument &$model, array $formData, User $user)
38+
public function apply(PurchaseDocument &$model, array $formData):void
3739
{
3840
if (property_exists($model, 'excluir347')) {
3941
$model->excluir347 = ($formData['excluir347'] ?? '') === 'true';
4042
}
4143
}
4244

43-
public function applyBefore(PurchaseDocument &$model, array $formData, User $user)
45+
public function applyBefore(PurchaseDocument &$model, array $formData): void
4446
{
4547
}
4648

@@ -58,9 +60,10 @@ public function newFields(): array
5860
return [];
5961
}
6062

61-
public function renderField(Translator $i18n, PurchaseDocument $model, string $field): ?string
63+
public function renderField(PurchaseDocument $model, string $field): ?string
6264
{
6365
if ($field == 'excluir347') {
66+
$i18n = new Translator();
6467
return $this->excluir347($i18n, $model);
6568
}
6669

@@ -88,8 +91,8 @@ private static function excluir347(Translator $i18n, PurchaseDocument $model): s
8891

8992
$attributes = $model->editable ? 'name="excluir347" required=""' : 'disabled=""';
9093
return '<div class="col-sm-6">'
91-
. '<div class="form-group">' . $i18n->trans('exclude-347')
92-
. '<select ' . $attributes . ' class="form-control"/>' . implode('', $options) . '</select>'
94+
. '<div class="mb-3">' . $i18n->trans('exclude-347')
95+
. '<select ' . $attributes . ' class="form-select"/>' . implode('', $options) . '</select>'
9396
. '</div>'
9497
. '</div>';
9598
}

‎Mod/SalesHeaderHTMLMod.php‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,12 @@
1919

2020
namespace FacturaScripts\Plugins\Modelo347\Mod;
2121

22-
use FacturaScripts\Core\Base\Contract\SalesModInterface;
23-
use FacturaScripts\Core\Base\Translator;
22+
use FacturaScripts\Core\Contract\SalesModInterface;
23+
use FacturaScripts\Core\Translator;
2424
use FacturaScripts\Core\Model\Base\SalesDocument;
2525
use FacturaScripts\Core\Model\User;
26+
use FacturaScripts\Core\Tools;
27+
2628

2729
/**
2830
* Add new fields in the modal window of the document header
@@ -33,14 +35,14 @@
3335
*/
3436
class SalesHeaderHTMLMod implements SalesModInterface
3537
{
36-
public function apply(SalesDocument &$model, array $formData, User $user)
38+
public function apply(SalesDocument &$model, array $formData): void
3739
{
3840
if (property_exists($model, 'excluir347')) {
3941
$model->excluir347 = ($formData['excluir347'] ?? '') === 'true';
4042
}
4143
}
4244

43-
public function applyBefore(SalesDocument &$model, array $formData, User $user)
45+
public function applyBefore(SalesDocument &$model, array $formData): void
4446
{
4547
}
4648

@@ -63,9 +65,10 @@ public function newModalFields(): array
6365
return ['excluir347'];
6466
}
6567

66-
public function renderField(Translator $i18n, SalesDocument $model, string $field): ?string
68+
public function renderField(SalesDocument $model, string $field): ?string
6769
{
6870
if ($field == 'excluir347') {
71+
$i18n = new Translator();
6972
return $this->excluir347($i18n, $model);
7073
}
7174

@@ -88,8 +91,8 @@ private static function excluir347(Translator $i18n, SalesDocument $model): stri
8891

8992
$attributes = $model->editable ? 'name="excluir347" required=""' : 'disabled=""';
9093
return '<div class="col-sm-6">'
91-
. '<div class="form-group">' . $i18n->trans('exclude-347')
92-
. '<select ' . $attributes . ' class="form-control"/>' . implode('', $options) . '</select>'
94+
. '<div class="mb-3">' . $i18n->trans('exclude-347')
95+
. '<select ' . $attributes . ' class="form-select"/>' . implode('', $options) . '</select>'
9396
. '</div>'
9497
. '</div>';
9598
}

‎Test/main/Extension/Table/FacturasTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,12 @@ public function testExistsPropertyFacturaCliente()
6363
$this->assertTrue($invoice->exists(), 'invoice-not-exists');
6464

6565
// comprobar el campo
66-
$this->assertTrue($invoice->loadFromCode($invoice->idfactura), 'cant-create-load');
66+
$this->assertTrue($invoice->load($invoice->idfactura), 'cant-create-load');
6767
$this->assertTrue($invoice->excluir347, 'value-not-saved');
6868
$invoice->excluir347 = false;
6969
$this->assertTrue($invoice->save(), 'cant-create-invoice');
7070

71-
$this->assertTrue($invoice->loadFromCode($invoice->idfactura), 'cant-create-load');
71+
$this->assertTrue($invoice->load($invoice->idfactura), 'cant-create-load');
7272
$this->assertFalse($invoice->excluir347, 'value-not-saved');
7373

7474
// eliminar la factura
@@ -97,12 +97,12 @@ public function testExistsPropertyFacturaProveedor()
9797
$this->assertTrue($invoice->exists(), 'invoice-not-exists');
9898

9999
// comprobar el campo
100-
$this->assertTrue($invoice->loadFromCode($invoice->idfactura), 'cant-create-load');
100+
$this->assertTrue($invoice->load($invoice->idfactura), 'cant-create-load');
101101
$this->assertTrue($invoice->excluir347, 'value-not-saved');
102102
$invoice->excluir347 = false;
103103
$this->assertTrue($invoice->save(), 'cant-create-invoice');
104104

105-
$this->assertTrue($invoice->loadFromCode($invoice->idfactura), 'cant-create-load');
105+
$this->assertTrue($invoice->load($invoice->idfactura), 'cant-create-load');
106106
$this->assertFalse($invoice->excluir347, 'value-not-saved');
107107

108108
// eliminar la factura

0 commit comments

Comments
 (0)