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

Merge pull request #16034 from Hystepik/develop#2

Browse Source 
Close #16027 New Feature copy Code Client
This commit is contained in:
Laurent Destailleur 2021-01-28 11:17:10 +01:00 committed by GitHub
commit 4fbf2fff6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
htdocs/core/js/lib_foot.js.php
View File

@ -210,3 +210,25 @@ print '
} }
}); });
});'."\n"; });'."\n";
print "\n/* JS CODE TO ENABLE ClipBoard copy paste*/\n";
print 'jQuery(\'.clipboardCopyPaste\').click(function() {
console.log(this.firstChild.innerText);
if ( window.getSelection ) {
selection = window.getSelection();
range = document.createRange();
range.selectNodeContents( this.firstChild );
selection.removeAllRanges();
selection.addRange( range );
}
document.execCommand( \'copy\' );
window.getSelection().removeAllRanges();
var lastchild = this.lastChild
var tmp =lastchild.innerHTML
lastchild.innerHTML = \''.dol_escape_js($langs->trans('CopiedToClipboard')).'\';
setTimeout(() => { lastchild.innerHTML = tmp; }, 1000);
})'."\n";

11
htdocs/core/lib/functions.lib.php
View File

@ -9239,3 +9239,14 @@ function readfileLowMemory($fullpath_original_file_osencoded, $method = -1)
fclose($handle2); fclose($handle2);
} }
} }
/**
* Create a button to copy $valuetoprint in the clipboard
* @param string $valuetoprint the value to print
* @return string the string to print for the button
*/
function showValueWithCopyAndPasteButton($valuetoprint)
{
$result = '<span class="clipboardCopyPaste"><span>'.$valuetoprint.'</span>&ensp;<span class="far fa-clipboard opacitymedium"></span></span>';
return $result;
}

1
htdocs/langs/en_US/companies.lang
View File

@ -467,3 +467,4 @@ RestOfEurope=Rest of Europe (EEC)
OutOfEurope=Out of Europe (EEC) OutOfEurope=Out of Europe (EEC)
CurrentOutstandingBillLate=Current outstanding bill late CurrentOutstandingBillLate=Current outstanding bill late
BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS. BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
CopiedToClipboard = Copied to clipboard

8
htdocs/societe/card.php
View File

@ -2423,8 +2423,11 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
if ($object->client) if ($object->client)
{ {
print '<tr><td>'; print '<tr><td>';
print $langs->trans('CustomerCode').'</td><td>'; print $langs->trans('CustomerCode');
print $object->code_client; print '</td>';
print '<td>';
print showValueWithCopyAndPasteButton($object->code_client);
print '</td>';
$tmpcheck = $object->check_codeclient(); $tmpcheck = $object->check_codeclient();
if ($tmpcheck != 0 && $tmpcheck != -5) { if ($tmpcheck != 0 && $tmpcheck != -5) {
print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>'; print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
@ -2935,7 +2938,6 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php'; include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
} }
} }
// End of page // End of page
llxFooter(); llxFooter();
$db->close(); $db->close();