Skip to content

Commit

Permalink
[RegistrationCertificate] fix: extrafields visibility & value freezing
Browse files Browse the repository at this point in the history
  • Loading branch information
Théo David committed Jun 28, 2022
1 parent faae872 commit 8d6944b
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 54 deletions.
57 changes: 17 additions & 40 deletions class/actions_dolicar.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,7 @@ public function printCommonFooter($parameters)
</script>
<?php
}
} else
if ($parameters['currentcontext'] == 'productlotcard' && GETPOST('action') != 'create') {
} else if ($parameters['currentcontext'] == 'productlotcard' && GETPOST('action') != 'create') {
require_once __DIR__ . '/../class/registrationcertificatefr.class.php';
require_once __DIR__ . '/../../../compta/facture/class/facture.class.php';
require_once __DIR__ . '/../../../commande/class/commande.class.php';
Expand Down Expand Up @@ -306,7 +305,7 @@ public function printCommonFooter($parameters)
$outputline .= '<td>'. dol_print_date($facture->date_creation, 'dayhour') .'</td>';
$outputline .= '</tr>';
}
break;
break;
// case 'facturedet':
// foreach ($object_ids as $object_id) {
//
Expand Down Expand Up @@ -335,7 +334,7 @@ public function printCommonFooter($parameters)
$outputline .= '<td>'. dol_print_date($propal->date_creation, 'dayhour') .'</td>';
$outputline .= '</tr>';
}
break;
break;
// case 'propaldet':
// foreach ($object_ids as $object_id) {
//
Expand Down Expand Up @@ -364,7 +363,7 @@ public function printCommonFooter($parameters)
$outputline .= '<td>'. dol_print_date($commande->date_creation, 'dayhour') .'</td>';
$outputline .= '</tr>';
}
break;
break;
// case 'commandedet':
// foreach ($object_ids as $object_id) {
//
Expand Down Expand Up @@ -420,16 +419,6 @@ public function printCommonFooter($parameters)
</script>
<?php
}


if (true) {
$this->results = array('myreturn' => 999);
$this->resprints = 'A text to show';
return 0; // or return 1 to replace standard code
} else {
$this->errors[] = 'Error message';
return -1;
}
}

/**
Expand Down Expand Up @@ -471,12 +460,8 @@ public function doActions($parameters, &$object, &$action, $hookmanager)
$registrationcertificatefr = new RegistrationCertificateFr($this->db);
$registrationcertificatefr->fetch(GETPOST('options_registrationcertificatefr'));

$_POST['options_registration_number'] = $registrationcertificatefr->a_registration_number;

$product = new Product($this->db);
$product->fetch($registrationcertificatefr->fk_product);

$_POST['options_vehicle_model'] = $product->ref;
$_POST['options_registration_number'] = $registrationcertificatefr->a_registration_number;
$_POST['options_vehicle_model'] = $registrationcertificatefr->d3_vehicle_model;
}

if (GETPOST('action') == 'addline') {
Expand All @@ -494,8 +479,8 @@ public function doActions($parameters, &$object, &$action, $hookmanager)
$productlot->fetch($registrationcertificatefr->fk_lot);

$_POST['options_registrationcertificatefr'] = $object->array_options['options_registrationcertificatefr'];
$_POST['options_registration_number'] = $registrationcertificatefr->a_registration_number;
$_POST['options_vehicle_model'] = $product->ref;
$_POST['options_registration_number'] = $object->array_options['options_registration_number'];
$_POST['options_vehicle_model'] = $object->array_options['options_vehicle_model'];
$_POST['options_mileage'] = $object->array_options['options_mileage'];
}

Expand All @@ -517,12 +502,8 @@ public function doActions($parameters, &$object, &$action, $hookmanager)
$registrationcertificatefr = new RegistrationCertificateFr($this->db);
$registrationcertificatefr->fetch(GETPOST('options_registrationcertificatefr'));

$_POST['options_registration_number'] = $registrationcertificatefr->a_registration_number;

$product = new Product($this->db);
$product->fetch($registrationcertificatefr->fk_product);

$_POST['options_vehicle_model'] = $product->ref;
$_POST['options_registration_number'] = $registrationcertificatefr->a_registration_number;
$_POST['options_vehicle_model'] = $registrationcertificatefr->d3_vehicle_model;
}

if (GETPOST('action') == 'addline') {
Expand All @@ -540,8 +521,8 @@ public function doActions($parameters, &$object, &$action, $hookmanager)
$productlot->fetch($registrationcertificatefr->fk_lot);

$_POST['options_registrationcertificatefr'] = $object->array_options['options_registrationcertificatefr'];
$_POST['options_registration_number'] = $registrationcertificatefr->a_registration_number;
$_POST['options_vehicle_model'] = $product->ref;
$_POST['options_registration_number'] = $object->array_options['options_registration_number'];
$_POST['options_vehicle_model'] = $object->array_options['options_vehicle_model'];
$_POST['options_mileage'] = $object->array_options['options_mileage'];
}

Expand All @@ -563,12 +544,8 @@ public function doActions($parameters, &$object, &$action, $hookmanager)
$registrationcertificatefr = new RegistrationCertificateFr($this->db);
$registrationcertificatefr->fetch(GETPOST('options_registrationcertificatefr'));

$_POST['options_registration_number'] = $registrationcertificatefr->a_registration_number;

$product = new Product($this->db);
$product->fetch($registrationcertificatefr->fk_product);

$_POST['options_vehicle_model'] = $product->ref;
$_POST['options_registration_number'] = $registrationcertificatefr->a_registration_number;
$_POST['options_vehicle_model'] = $registrationcertificatefr->d3_vehicle_model;
}

if (GETPOST('action') == 'addline') {
Expand All @@ -586,8 +563,8 @@ public function doActions($parameters, &$object, &$action, $hookmanager)
$productlot->fetch($registrationcertificatefr->fk_lot);

$_POST['options_registrationcertificatefr'] = $object->array_options['options_registrationcertificatefr'];
$_POST['options_registration_number'] = $registrationcertificatefr->a_registration_number;
$_POST['options_vehicle_model'] = $product->ref;
$_POST['options_registration_number'] = $object->array_options['options_registration_number'];
$_POST['options_vehicle_model'] = $object->array_options['options_vehicle_model'];
$_POST['options_mileage'] = $object->array_options['options_mileage'];
}

Expand Down Expand Up @@ -690,7 +667,7 @@ public function beforePDFCreation($parameters, &$object, &$action)
$registrationcertificatefr = new RegistrationCertificateFr($this->db);
$registrationcertificatefr->fetch($object->array_options['options_registrationcertificatefr']);
$object->fetch_optionals();
$object->note_public = $langs->transnoentities('RegistrationNumber') . ' : ' . $registrationcertificatefr->a_registration_number . '<br>';
$object->note_public = $langs->transnoentities('RegistrationNumber') . ' : ' . $object->array_options['options_registration_number'] . '<br>';
$object->note_public .= $langs->transnoentities('VehicleModel') . ' : ' . $object->array_options['options_vehicle_model'] . '<br>';
$object->note_public .= $langs->transnoentities('Mileage') . ' : ' . $object->array_options['options_mileage'] . '<br>';
}
Expand Down
5 changes: 3 additions & 2 deletions class/registrationcertificatefr.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,10 +183,11 @@ class RegistrationCertificateFr extends CommonObject
public $f1_techincal_ptac;
public $f2_ptac;
public $c4a_owner_vehicle;
public $d2_vehicle_type;
public $d21_vehicle_cnit;
public $fk_product;
public $d1_vehicle_brand;
public $d2_vehicle_type;
public $d21_vehicle_cnit;
public $d3_vehicle_model;
public $f3_ptra;
public $g_vehicle_weight;
public $g1_vehicle_empty_weight;
Expand Down
24 changes: 12 additions & 12 deletions core/modules/modDoliCar.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -315,39 +315,39 @@ public function init($options = '')

// Facture extrafields
$extrafields->addExtraField('registrationcertificatefr', $langs->transnoentities("RegistrationCertificateFr"), 'sellist', 1030, '', 'facture', 0, 0, '', 'a:1:{s:7:"options";a:1:{s:80:"dolicar_registrationcertificatefr:a_registration_number:rowid::entity = $ENTITY$";N;}}', '', '', 1);
$extrafields->addExtraField('vehicle_model', $langs->transnoentities("ProductLinked"), 'varchar', 1040, '255', 'facture', 0, 0, '', '', 1, '', 1);
$extrafields->addExtraField('vehicle_model', $langs->transnoentities("VehicleModel"), 'varchar', 1040, '255', 'facture', 0, 0, '', '', 1, '', 1);
$extrafields->addExtraField('mileage', $langs->transnoentities("Mileage"), 'int', 1050, '', 'facture', 0, 0, '', '', 1, '', 1);
$extrafields->addExtraField('registration_number', $langs->transnoentities("RegistrationNumber"), 'varchar', 1060, '255', 'facture', 0, 0, '', '', 1, '', 0);
$extrafields->addExtraField('registration_number', $langs->transnoentities("RegistrationNumber"), 'varchar', 1060, '255', 'facture', 0, 0, '', '', 1, '', 1);

// Facturedet extrafields
$extrafields->addExtraField('registrationcertificatefr', $langs->transnoentities("RegistrationCertificateFr"), 'sellist', 1030, '', 'facturedet', 0, 0, '', 'a:1:{s:7:"options";a:1:{s:80:"dolicar_registrationcertificatefr:a_registration_number:rowid::entity = $ENTITY$";N;}}', '', '', 1);
$extrafields->addExtraField('vehicle_model', $langs->transnoentities("ProductLinked"), 'varchar', 1040, '255', 'facturedet', 0, 0, '', '', 1, '', 1);
$extrafields->addExtraField('vehicle_model', $langs->transnoentities("VehicleModel"), 'varchar', 1040, '255', 'facturedet', 0, 0, '', '', 1, '', 1);
$extrafields->addExtraField('mileage', $langs->transnoentities("Mileage"), 'int', 1050, '', 'facturedet', 0, 0, '', '', 1, '', 1);
$extrafields->addExtraField('registration_number', $langs->transnoentities("RegistrationNumber"), 'varchar', 1060, '255', 'facturedet', 0, 0, '', '', 1, '', 0);
$extrafields->addExtraField('registration_number', $langs->transnoentities("RegistrationNumber"), 'varchar', 1060, '255', 'facturedet', 0, 0, '', '', 1, '', 1);

// Propal extrafields
$extrafields->addExtraField('registrationcertificatefr', $langs->transnoentities("RegistrationCertificateFr"), 'sellist', 1030, '', 'propal', 0, 0, '', 'a:1:{s:7:"options";a:1:{s:80:"dolicar_registrationcertificatefr:a_registration_number:rowid::entity = $ENTITY$";N;}}', '', '', 1);
$extrafields->addExtraField('vehicle_model', $langs->transnoentities("ProductLinked"), 'varchar', 1040, '255', 'propal', 0, 0, '', '', 1, '', 1);
$extrafields->addExtraField('vehicle_model', $langs->transnoentities("VehicleModel"), 'varchar', 1040, '255', 'propal', 0, 0, '', '', 1, '', 1);
$extrafields->addExtraField('mileage', $langs->transnoentities("Mileage"), 'int', 1050, '', 'propal', 0, 0, '', '', 1, '', 1);
$extrafields->addExtraField('registration_number', $langs->transnoentities("RegistrationNumber"), 'varchar', 1060, '255', 'propal', 0, 0, '', '', 1, '', 0);
$extrafields->addExtraField('registration_number', $langs->transnoentities("RegistrationNumber"), 'varchar', 1060, '255', 'propal', 0, 0, '', '', 1, '', 1);

// Propaldet extrafields
$extrafields->addExtraField('registrationcertificatefr', $langs->transnoentities("RegistrationCertificateFr"), 'sellist', 1030, '', 'propaldet', 0, 0, '', 'a:1:{s:7:"options";a:1:{s:80:"dolicar_registrationcertificatefr:a_registration_number:rowid::entity = $ENTITY$";N;}}', '', '', 1);
$extrafields->addExtraField('vehicle_model', $langs->transnoentities("ProductLinked"), 'varchar', 1040, '255', 'propaldet', 0, 0, '', '', 1, '', 1);
$extrafields->addExtraField('vehicle_model', $langs->transnoentities("VehicleModel"), 'varchar', 1040, '255', 'propaldet', 0, 0, '', '', 1, '', 1);
$extrafields->addExtraField('mileage', $langs->transnoentities("Mileage"), 'int', 1050, '', 'propaldet', 0, 0, '', '', 1, '', 1);
$extrafields->addExtraField('registration_number', $langs->transnoentities("RegistrationNumber"), 'varchar', 1060, '255', 'propaldet', 0, 0, '', '', 1, '', 0);
$extrafields->addExtraField('registration_number', $langs->transnoentities("RegistrationNumber"), 'varchar', 1060, '255', 'propaldet', 0, 0, '', '', 1, '', 1);

// Commande extrafields
$extrafields->addExtraField('registrationcertificatefr', $langs->transnoentities("RegistrationCertificateFr"), 'sellist', 1030, '', 'commande', 0, 0, '', 'a:1:{s:7:"options";a:1:{s:80:"dolicar_registrationcertificatefr:a_registration_number:rowid::entity = $ENTITY$";N;}}', '', '', 1);
$extrafields->addExtraField('vehicle_model', $langs->transnoentities("ProductLinked"), 'varchar', 1040, '255', 'commande', 0, 0, '', '', 1, '', 1);
$extrafields->addExtraField('vehicle_model', $langs->transnoentities("VehicleModel"), 'varchar', 1040, '255', 'commande', 0, 0, '', '', 1, '', 1);
$extrafields->addExtraField('mileage', $langs->transnoentities("Mileage"), 'int', 1050, '', 'commande', 0, 0, '', '', 1, '', 1);
$extrafields->addExtraField('registration_number', $langs->transnoentities("RegistrationNumber"), 'varchar', 1060, '255', 'commande', 0, 0, '', '', 1, '', 0);
$extrafields->addExtraField('registration_number', $langs->transnoentities("RegistrationNumber"), 'varchar', 1060, '255', 'commande', 0, 0, '', '', 1, '', 1);

// Commandedet extrafields
$extrafields->addExtraField('registrationcertificatefr', $langs->transnoentities("RegistrationCertificateFr"), 'sellist', 1030, '', 'commandedet', 0, 0, '', 'a:1:{s:7:"options";a:1:{s:80:"dolicar_registrationcertificatefr:a_registration_number:rowid::entity = $ENTITY$";N;}}', '', '', 1);
$extrafields->addExtraField('vehicle_model', $langs->transnoentities("ProductLinked"), 'varchar', 1040, '255', 'commandedet', 0, 0, '', '', 1, '', 1);
$extrafields->addExtraField('vehicle_model', $langs->transnoentities("VehicleModel"), 'varchar', 1040, '255', 'commandedet', 0, 0, '', '', 1, '', 1);
$extrafields->addExtraField('mileage', $langs->transnoentities("Mileage"), 'int', 1050, '', 'commandedet', 0, 0, '', '', 1, '', 1);
$extrafields->addExtraField('registration_number', $langs->transnoentities("RegistrationNumber"), 'varchar', 1060, '255', 'commandedet', 0, 0, '', '', 1, '', 0);
$extrafields->addExtraField('registration_number', $langs->transnoentities("RegistrationNumber"), 'varchar', 1060, '255', 'commandedet', 0, 0, '', '', 1, '', 1);

// Permissions
$this->remove($options);
Expand Down

0 comments on commit 8d6944b

Please sign in to comment.