lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NEW: online propal signature

Browse Source
This commit is contained in:
lmarcouiller 2021-10-18 14:28:30 +02:00
parent c3a45dabad
commit 0c2cf9980d
4 changed files with 41 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/core/ajax/onlineSign.php
View File

@ -117,6 +117,7 @@ if ($action == "importSignature") {
if (!$error) {
$db->commit();
$response = "success";
setEventMessage("PropalSigned");
} else {
$db->rollback();
$response = "error sql";

9
htdocs/langs/en_US/propal.lang
View File

@ -89,4 +89,11 @@ IdProposal=Proposal ID
IdProduct=Product ID
PrParentLine=Proposal Parent Line
LineBuyPriceHT=Buy Price Amount net of tax for line
SignPropal=Sign proposal
RefusePropal=Refuse proposal
Sign=Sign
PropalAlreadyRefused=Proposal already refused
PropalAlreadySigned=Proposal already signed
PropalSigned=Proposal signed
PropalRefused=Proposal refused
ConfirmRefusePropal=Are you sure you want to refuse this commercial proposal?

9
htdocs/langs/fr_FR/propal.lang
View File

@ -89,4 +89,11 @@ IdProposal=ID de la proposition commerciale
IdProduct=ID produit
PrParentLine=Ligne parent de proposition
LineBuyPriceHT=Prix d'achat HT de la ligne
SignPropal=Signer la proposition commerciale
RefusePropal=Refuser la proposition commerciale
Sign=Signer
PropalAlreadyRefused=Proposition commerciale déjà refusée
PropalAlreadySigned=Proposition commerciale déjà signée
PropalSigned=Proposition commerciale signée
PropalRefused=Proposition commerciale refusée
ConfirmRefusePropal=Êtes-vous sûr de vouloir refuser cette proposition commerciale ?

30
htdocs/public/onlinesign/newonlinesign.php
View File

@ -52,7 +52,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
// Load translation files
$langs->loadLangs(array("main", "other", "dict", "bills", "companies", "errors", "paybox"));
$langs->loadLangs(array("main", "other", "dict", "bills", "companies", "errors", "paybox","propal"));
// Security check
// No check on module enabled. Done later according to $validpaymentmethod
@ -124,9 +124,22 @@ $object->fetch(0, $ref);
* Actions
*/
if ($action == 'refusepropal') {
//TODO: creer suite de cette action
if ($action == 'confirm_refusepropal') {
$sql = "UPDATE ".MAIN_DB_PREFIX."propal";
$sql .= " SET fk_statut = ".((int) $object::STATUS_NOTSIGNED).", note_private = '".$object->note_private."', date_signature='".$db->idate(dol_now())."'";
$sql .= " WHERE rowid = ".((int) $object->id);
dol_syslog(__METHOD__, LOG_DEBUG);
$resql = $db->query($sql);
if (!$resql) {
$error++;
}
if (!$error) {
$db->commit();
setEventMessage("PropalRefused");
} else {
$db->rollback();
}
$object->fetch(0, $ref);
}
@ -134,6 +147,7 @@ if ($action == 'refusepropal') {
* View
*/
$form = new Form($db);
$head = '';
if (!empty($conf->global->MAIN_SIGN_CSS_URL)) {
$head = '<link rel="stylesheet" type="text/css" href="'.$conf->global->MAIN_SIGN_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
@ -145,6 +159,10 @@ $conf->dol_hide_leftmenu = 1;
$replacemainarea = (empty($conf->dol_hide_leftmenu) ? '<div>' : '').'<div>';
llxHeader($head, $langs->trans("OnlineSignature"), '', '', 0, 0, '', '', '', 'onlinepaymentbody', $replacemainarea, 1);
if ($action == 'refusepropal') {
print $form->formconfirm($_SERVER["PHP_SELF"].'?ref='.$ref, $langs->trans('RefusePropal'), $langs->trans('ConfirmRefusePropal', $object->ref), 'confirm_refusepropal', '', '', 1);
}
// Check link validity for param 'source'
if (!empty($source) && in_array($ref, array('member_ref', 'contractline_ref', 'invoice_ref', 'order_ref', ''))) {
$langs->load("errors");
@ -351,9 +369,9 @@ if ($action == "dosign" && empty($cancel)) {
</script>';
} else {
if ($object->status == $object::STATUS_SIGNED) {
print $langs->trans("PropalSigned");
print $langs->trans("PropalAlreadySigned");
} elseif ($object->status == $object::STATUS_NOTSIGNED) {
print $langs->trans("PropalNotSigned");
print $langs->trans("PropalAlreadyRefused");
} else {
print '<input type="submit" class="button" value="'.$langs->trans("SignPropal").'">';
print '<input name="refusepropal" type="submit" class="button" value="'.$langs->trans("RefusePropal").'">';