Merge pull request #1987 from IonAgorria/soap-client-order
Added SOAP client for creating a client order in remote webservice
This commit is contained in:
Laurent Destailleur
commit
a1a10edc30
121
htdocs/core/modules/modSyncSupplierWebServices.class.php
Executable file
121
htdocs/core/modules/modSyncSupplierWebServices.class.php
Executable file
@ -0,0 +1,121 @@
|
||||
<?php
|
||||
/* Copyright (C) 2014 Ion Agorria <ion@agorria.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
/**
|
||||
* \defgroup webservices Module webservices
|
||||
* \brief Module to enable client for supplier WebServices
|
||||
* \file htdocs/core/modules/modSyncSupplierWebServices.class.php
|
||||
* \ingroup webservices
|
||||
* \brief File to describe client for supplier webservices module
|
||||
*/
|
||||
include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
|
||||
|
||||
/**
|
||||
* Class to describe a WebServices module
|
||||
*/
|
||||
class modSyncSupplierWebServices extends DolibarrModules
|
||||
{
|
||||
|
||||
/**
|
||||
* Constructor. Define names, constants, directories, boxes, permissions
|
||||
*
|
||||
* @param DoliDB $db Database handler
|
||||
*/
|
||||
function __construct($db)
|
||||
{
|
||||
$this->db = $db;
|
||||
$this->numero = 2650;
|
||||
|
||||
$this->family = "technic";
|
||||
// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
|
||||
$this->name = preg_replace('/^mod/i','',get_class($this));
|
||||
$this->description = "Enable the client for external supplier web services";
|
||||
$this->version = 'dolibarr'; // 'experimental' or 'dolibarr' or version
|
||||
// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
|
||||
$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
|
||||
// Where to store the module in setup page (0=common,1=interface,2=others,3=very specific)
|
||||
$this->special = 1;
|
||||
// Name of image file used for this module.
|
||||
$this->picto='technic';
|
||||
|
||||
// Data directories to create when module is enabled
|
||||
$this->dirs = array();
|
||||
|
||||
// Config pages
|
||||
//-------------
|
||||
//$this->config_page_url = array("webservices.php@webservices");
|
||||
|
||||
// Dependancies
|
||||
//-------------
|
||||
$this->depends = array();
|
||||
$this->requiredby = array();
|
||||
$this->langfiles = array("other");
|
||||
|
||||
// Constantes
|
||||
//-----------
|
||||
$this->const = array();
|
||||
|
||||
// New pages on tabs
|
||||
// -----------------
|
||||
$this->tabs = array();
|
||||
|
||||
// Boxes
|
||||
//------
|
||||
$this->boxes = array();
|
||||
|
||||
// Permissions
|
||||
//------------
|
||||
$this->rights = array();
|
||||
$this->rights_class = 'syncsupplierwebservices';
|
||||
$r=0;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Function called when module is enabled.
|
||||
* The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
|
||||
* It also creates data directories
|
||||
*
|
||||
* @param string $options Options when enabling module ('', 'noboxes')
|
||||
* @return int 1 if OK, 0 if KO
|
||||
*/
|
||||
function init($options='')
|
||||
{
|
||||
// Prevent pb of modules not correctly disabled
|
||||
//$this->remove($options);
|
||||
|
||||
$sql = array();
|
||||
|
||||
return $this->_init($sql,$options);
|
||||
}
|
||||
|
||||
/**
|
||||
* Function called when module is disabled.
|
||||
* Remove from database constants, boxes and permissions from Dolibarr database.
|
||||
* Data directories are not deleted
|
||||
*
|
||||
* @param string $options Options when enabling module ('', 'noboxes')
|
||||
* @return int 1 if OK, 0 if KO
|
||||
*/
|
||||
function remove($options='')
|
||||
{
|
||||
$sql = array();
|
||||
|
||||
return $this->_remove($sql,$options);
|
||||
}
|
||||
|
||||
}
|
||||
@ -7,6 +7,7 @@
|
||||
* Copyright (C) 2011 Philippe Grand <philippe.grand@atoo-net.com>
|
||||
* Copyright (C) 2012 Marcos García <marcosgdf@gmail.com>
|
||||
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
|
||||
* Copyright (C) 2014 Ion Agorria <ion@agorria.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
@ -43,7 +44,9 @@ if (!empty($conf->produit->enabled))
|
||||
require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
|
||||
if (!empty($conf->projet->enabled))
|
||||
require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
|
||||
require_once NUSOAP_PATH.'/nusoap.php'; // Include SOAP
|
||||
|
||||
$langs->load('admin');
|
||||
$langs->load('orders');
|
||||
$langs->load('sendings');
|
||||
$langs->load('companies');
|
||||
@ -1044,6 +1047,99 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G
|
||||
}
|
||||
}
|
||||
|
||||
if ($action == 'webservice' && GETPOST('mode', 'alpha') == "send" && ! GETPOST('cancel'))
|
||||
{
|
||||
$ws_url = $object->thirdparty->webservices_url;
|
||||
$ws_key = $object->thirdparty->webservices_key;
|
||||
$ws_user = GETPOST('ws_user','alpha');
|
||||
$ws_password = GETPOST('ws_password','alpha');
|
||||
$ws_entity = GETPOST('ws_entity','int');
|
||||
$ws_thirdparty = GETPOST('ws_thirdparty','int');
|
||||
|
||||
// NS and Authentication parameters
|
||||
$ws_ns='http://www.dolibarr.org/ns/';
|
||||
$ws_authentication=array(
|
||||
'dolibarrkey'=>$ws_key,
|
||||
'sourceapplication'=>'DolibarrWebServiceClient',
|
||||
'login'=>$ws_user,
|
||||
'password'=>$ws_password,
|
||||
'entity'=>$ws_entity
|
||||
);
|
||||
|
||||
//Is sync supplier web services module activated? and everything filled?
|
||||
if (empty($conf->syncsupplierwebservices->enabled)) {
|
||||
setEventMessage($langs->trans("WarningModuleNotActive",$langs->transnoentities("Module2650Name")));
|
||||
} else if (empty($ws_url) || empty($ws_key)) {
|
||||
setEventMessage($langs->trans("ErrorWebServicesFieldsRequired"), 'errors');
|
||||
} else if (empty($ws_user) || empty($ws_password) || empty($ws_thirdparty)) {
|
||||
setEventMessage($langs->trans("ErrorFieldsRequired"), 'errors');
|
||||
}
|
||||
else
|
||||
{
|
||||
//Create SOAP client and connect it to order
|
||||
$soapclient_order = new nusoap_client($ws_url."/webservices/server_order.php");
|
||||
$soapclient_order->soap_defencoding='UTF-8';
|
||||
$soapclient_order->decodeUTF8(false);
|
||||
|
||||
//Create SOAP client and connect it to product/service
|
||||
$soapclient_product = new nusoap_client($ws_url."/webservices/server_productorservice.php");
|
||||
$soapclient_product->soap_defencoding='UTF-8';
|
||||
$soapclient_product->decodeUTF8(false);
|
||||
|
||||
//Prepare the order lines from order
|
||||
$order_lines = array();
|
||||
foreach ($object->lines as $line)
|
||||
{
|
||||
$ws_parameters = array('authentication' => $ws_authentication, 'id' => '', 'ref' => $line->ref_supplier);
|
||||
$result_product = $soapclient_product->call("getProductOrService", $ws_parameters, $ws_ns, '');
|
||||
|
||||
if ($result_product["result"]["result_code"] == "OK")
|
||||
{
|
||||
$order_lines[] = array(
|
||||
'desc' => $line->product_desc,
|
||||
'type' => $line->product_type,
|
||||
'product_id' => $result_product["product"]["id"],
|
||||
'vat_rate' => $line->tva_tx,
|
||||
'qty' => $line->qty,
|
||||
'price' => $line->price,
|
||||
'unitprice' => $line->subprice,
|
||||
'total_net' => $line->total_ht,
|
||||
'total_vat' => $line->total_tva,
|
||||
'total' => $line->total_ttc,
|
||||
'date_start' => $line->date_start,
|
||||
'date_end' => $line->date_end,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
//Prepare the order header
|
||||
$order = array(
|
||||
'thirdparty_id' => $ws_thirdparty,
|
||||
'date' => dol_print_date(dol_now(),'dayrfc'),
|
||||
'total_net' => $object->total_ht,
|
||||
'total_var' => $object->total_tva,
|
||||
'total' => $object->total_ttc,
|
||||
'lines' => $order_lines
|
||||
);
|
||||
|
||||
$ws_parameters = array('authentication'=>$ws_authentication, 'order' => $order);
|
||||
$result_order = $soapclient_order->call("createOrder", $ws_parameters, $ws_ns, '');
|
||||
|
||||
if (empty($result_order["result"]["result_code"])) //No result, check error str
|
||||
{
|
||||
setEventMessage($langs->trans("SOAPError")." '".$soapclient_order->error_str."'", 'errors');
|
||||
}
|
||||
else if ($result_order["result"]["result_code"] != "OK") //Something went wrong
|
||||
{
|
||||
setEventMessage($langs->trans("SOAPError")." '".$result_order["result"]["result_code"]."' - '".$result_order["result"]["result_label"]."'", 'errors');
|
||||
}
|
||||
else
|
||||
{
|
||||
setEventMessage($langs->trans("RemoteOrderRef")." ".$result_order["ref"], 'mesgs');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->fournisseur->commande->creer)
|
||||
{
|
||||
if ($action == 'addcontact')
|
||||
@ -1769,7 +1865,324 @@ elseif (! empty($object->id))
|
||||
dol_fiche_end();
|
||||
|
||||
|
||||
if ($action != 'presend')
|
||||
/*
|
||||
* Action presend
|
||||
*/
|
||||
if ($action == 'presend')
|
||||
{
|
||||
$ref = dol_sanitizeFileName($object->ref);
|
||||
include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
|
||||
$fileparams = dol_most_recent_file($conf->fournisseur->commande->dir_output . '/' . $ref, preg_quote($ref,'/'));
|
||||
$file=$fileparams['fullname'];
|
||||
|
||||
// Define output language
|
||||
$outputlangs = $langs;
|
||||
$newlang = '';
|
||||
if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
|
||||
$newlang = $_REQUEST['lang_id'];
|
||||
if ($conf->global->MAIN_MULTILANGS && empty($newlang))
|
||||
$newlang = $object->client->default_lang;
|
||||
|
||||
if (!empty($newlang))
|
||||
{
|
||||
$outputlangs = new Translate('', $conf);
|
||||
$outputlangs->setDefaultLang($newlang);
|
||||
$outputlangs->load('commercial');
|
||||
}
|
||||
|
||||
// Build document if it not exists
|
||||
if (! $file || ! is_readable($file))
|
||||
{
|
||||
$result= $object->generateDocument(GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
|
||||
if ($result <= 0)
|
||||
{
|
||||
dol_print_error($db,$result);
|
||||
exit;
|
||||
}
|
||||
$fileparams = dol_most_recent_file($conf->fournisseur->commande->dir_output . '/' . $ref, preg_quote($ref,'/'));
|
||||
$file=$fileparams['fullname'];
|
||||
}
|
||||
|
||||
print '<br>';
|
||||
|
||||
print_titre($langs->trans('SendOrderByMail'));
|
||||
|
||||
// Cree l'objet formulaire mail
|
||||
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
|
||||
$formmail = new FormMail($db);
|
||||
$formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
|
||||
$formmail->fromtype = 'user';
|
||||
$formmail->fromid = $user->id;
|
||||
$formmail->fromname = $user->getFullName($langs);
|
||||
$formmail->frommail = $user->email;
|
||||
$formmail->withfrom=1;
|
||||
$liste=array();
|
||||
foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key=>$value) $liste[$key]=$value;
|
||||
$formmail->withto=GETPOST("sendto")?GETPOST("sendto"):$liste;
|
||||
$formmail->withtocc=$liste;
|
||||
$formmail->withtoccc=(! empty($conf->global->MAIN_EMAIL_USECCC)?$conf->global->MAIN_EMAIL_USECCC:false);
|
||||
$formmail->withtopic=$outputlangs->trans('SendOrderRef','__ORDERREF__');
|
||||
$formmail->withfile=2;
|
||||
$formmail->withbody=1;
|
||||
$formmail->withdeliveryreceipt=1;
|
||||
$formmail->withcancel=1;
|
||||
// Tableau des substitutions
|
||||
$formmail->substit['__ORDERREF__']=$object->ref;
|
||||
$formmail->substit['__SIGNATURE__']=$user->signature;
|
||||
$formmail->substit['__PERSONALIZED__']='';
|
||||
$formmail->substit['__CONTACTCIVNAME__']='';
|
||||
|
||||
//Find the good contact adress
|
||||
$custcontact='';
|
||||
$contactarr=array();
|
||||
$contactarr=$object->liste_contact(-1,'external');
|
||||
|
||||
if (is_array($contactarr) && count($contactarr)>0) {
|
||||
foreach($contactarr as $contact) {
|
||||
if ($contact['libelle']==$langs->trans('TypeContact_order_supplier_external_BILLING')) {
|
||||
require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
|
||||
$contactstatic=new Contact($db);
|
||||
$contactstatic->fetch($contact['id']);
|
||||
$custcontact=$contactstatic->getFullName($langs,1);
|
||||
}
|
||||
}
|
||||
|
||||
if (!empty($custcontact)) {
|
||||
$formmail->substit['__CONTACTCIVNAME__']=$custcontact;
|
||||
}
|
||||
}
|
||||
|
||||
// Tableau des parametres complementaires
|
||||
$formmail->param['action']='send';
|
||||
$formmail->param['models']='order_supplier_send';
|
||||
$formmail->param['orderid']=$object->id;
|
||||
$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
|
||||
|
||||
// Init list of files
|
||||
if (GETPOST("mode")=='init')
|
||||
{
|
||||
$formmail->clear_attached_files();
|
||||
$formmail->add_attached_files($file,basename($file),dol_mimetype($file));
|
||||
}
|
||||
|
||||
// Show form
|
||||
print $formmail->get_form();
|
||||
|
||||
print '<br>';
|
||||
}
|
||||
/*
|
||||
* Action webservice
|
||||
*/
|
||||
elseif ($action == 'webservice' && GETPOST('mode', 'alpha') != "send" && ! GETPOST('cancel'))
|
||||
{
|
||||
$mode = GETPOST('mode', 'alpha');
|
||||
$ws_url = $object->thirdparty->webservices_url;
|
||||
$ws_key = $object->thirdparty->webservices_key;
|
||||
$ws_user = GETPOST('ws_user','alpha');
|
||||
$ws_password = GETPOST('ws_password','alpha');
|
||||
|
||||
// NS and Authentication parameters
|
||||
$ws_ns = 'http://www.dolibarr.org/ns/';
|
||||
$ws_authentication = array(
|
||||
'dolibarrkey'=>$ws_key,
|
||||
'sourceapplication'=>'DolibarrWebServiceClient',
|
||||
'login'=>$ws_user,
|
||||
'password'=>$ws_password,
|
||||
'entity'=>''
|
||||
);
|
||||
|
||||
print_titre($langs->trans('CreateRemoteOrder'));
|
||||
|
||||
//Is everything filled?
|
||||
if (empty($ws_url) || empty($ws_key)) {
|
||||
setEventMessage($langs->trans("ErrorWebServicesFieldsRequired"), 'errors');
|
||||
$mode = "init";
|
||||
$error_occurred = true; //Don't allow to set the user/pass if thirdparty fields are not filled
|
||||
} else if ($mode != "init" && (empty($ws_user) || empty($ws_password))) {
|
||||
setEventMessage($langs->trans("ErrorFieldsRequired"), 'errors');
|
||||
$mode = "init";
|
||||
}
|
||||
|
||||
if ($mode == "init")
|
||||
{
|
||||
//Table/form header
|
||||
print '<table class="border" width="100%">';
|
||||
print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
|
||||
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
|
||||
print '<input type="hidden" name="action" value="webservice">';
|
||||
print '<input type="hidden" name="mode" value="check">';
|
||||
|
||||
if ($error_occurred)
|
||||
{
|
||||
print "<br>".$langs->trans("ErrorOccurredReviseAndRetry")."<br>";
|
||||
print '<input class="button" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
|
||||
}
|
||||
else
|
||||
{
|
||||
$textinput_size = "50";
|
||||
// Webservice url
|
||||
print '<tr><td>'.$langs->trans("WebServiceURL").'</td><td colspan="3">'.dol_print_url($ws_url).'</td></tr>';
|
||||
//Remote User
|
||||
print '<tr><td>'.$langs->trans("User").'</td><td><input size="'.$textinput_size.'" type="text" name="ws_user"></td></tr>';
|
||||
//Remote Password
|
||||
print '<tr><td>'.$langs->trans("Password").'</td><td><input size="'.$textinput_size.'" type="text" name="ws_password"></td></tr>';
|
||||
//Submit button
|
||||
print '<tr><td align="center" colspan="2">';
|
||||
print '<input class="button" type="submit" id="ws_submit" name="ws_submit" value="'.$langs->trans("CreateRemoteOrder").'">';
|
||||
print ' ';
|
||||
//Cancel button
|
||||
print '<input class="button" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
|
||||
print '</td></tr>';
|
||||
}
|
||||
|
||||
//End table/form
|
||||
print '</form>';
|
||||
print '</table>';
|
||||
}
|
||||
elseif ($mode == "check")
|
||||
{
|
||||
$ws_entity = '';
|
||||
$ws_thirdparty = '';
|
||||
$error_occurred = false;
|
||||
|
||||
//Create SOAP client and connect it to user
|
||||
$soapclient_user = new nusoap_client($ws_url."/webservices/server_user.php");
|
||||
$soapclient_user->soap_defencoding='UTF-8';
|
||||
$soapclient_user->decodeUTF8(false);
|
||||
|
||||
//Get the thirdparty associated to user
|
||||
$ws_parameters = array('authentication'=>$ws_authentication, 'id' => '', 'ref'=>$ws_user);
|
||||
$result_user = $soapclient_user->call("getUser", $ws_parameters, $ws_ns, '');
|
||||
$user_status_code = $result_user["result"]["result_code"];
|
||||
|
||||
if ($user_status_code == "OK")
|
||||
{
|
||||
//Fill the variables
|
||||
$ws_entity = $result_user["user"]["entity"];
|
||||
$ws_authentication['entity'] = $ws_entity;
|
||||
$ws_thirdparty = $result_user["user"]["fk_thirdparty"];
|
||||
if (empty($ws_thirdparty))
|
||||
{
|
||||
setEventMessage($langs->trans("RemoteUserMissingAssociatedSoc"), 'errors');
|
||||
$error_occurred = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
//Create SOAP client and connect it to product/service
|
||||
$soapclient_product = new nusoap_client($ws_url."/webservices/server_productorservice.php");
|
||||
$soapclient_product->soap_defencoding='UTF-8';
|
||||
$soapclient_product->decodeUTF8(false);
|
||||
|
||||
// Iterate each line and get the reference that uses the supplier of that product/service
|
||||
$i = 0;
|
||||
foreach ($object->lines as $line) {
|
||||
$i = $i + 1;
|
||||
$ref_supplier = $line->ref_supplier;
|
||||
$line_id = $i."º) ".$line->product_ref.": ";
|
||||
if (empty($ref_supplier)) {
|
||||
continue;
|
||||
}
|
||||
$ws_parameters = array('authentication' => $ws_authentication, 'id' => '', 'ref' => $ref_supplier);
|
||||
$result_product = $soapclient_product->call("getProductOrService", $ws_parameters, $ws_ns, '');
|
||||
if (!$result_product)
|
||||
{
|
||||
setEventMessage($line_id.$langs->trans("SOAPError")." ".$soapclient_product->error_str." - ".$soapclient_product->response, 'errors');
|
||||
$error_occurred = true;
|
||||
break;
|
||||
}
|
||||
|
||||
// Check the result code
|
||||
$status_code = $result_product["result"]["result_code"];
|
||||
if (empty($status_code)) //No result, check error str
|
||||
{
|
||||
setEventMessage($langs->trans("SOAPError")." '".$soapclient_order->error_str."'", 'errors');
|
||||
}
|
||||
else if ($status_code != "OK") //Something went wrong
|
||||
{
|
||||
if ($status_code == "NOT_FOUND")
|
||||
{
|
||||
setEventMessage($line_id.$langs->trans("SupplierMissingRef")." '".$ref_supplier."'", 'warnings');
|
||||
}
|
||||
else
|
||||
{
|
||||
setEventMessage($line_id.$langs->trans("ResponseNonOK")." '".$status_code."' - '".$result_product["result"]["result_label"]."'", 'errors');
|
||||
$error_occurred = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Ensure that price is equal and warn user if it's not
|
||||
$supplier_price = price($result_product["product"]["price_net"]); //Price of client tab in supplier dolibarr
|
||||
$local_price = NULL; //Price of supplier as stated in product suppliers tab on this dolibarr, NULL if not found
|
||||
|
||||
$product_fourn = new ProductFournisseur($db);
|
||||
$product_fourn_list = $product_fourn->list_product_fournisseur_price($line->fk_product);
|
||||
if (count($product_fourn_list)>0)
|
||||
{
|
||||
foreach($product_fourn_list as $product_fourn_line)
|
||||
{
|
||||
//Only accept the line where the supplier is the same at this order and has the same ref
|
||||
if ($product_fourn_line->fourn_id == $object->socid && $product_fourn_line->fourn_ref == $ref_supplier) {
|
||||
$local_price = price($product_fourn_line->fourn_price);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ($local_price != NULL && $local_price != $supplier_price) {
|
||||
setEventMessage($line_id.$langs->trans("RemotePriceMismatch")." ".$supplier_price." - ".$local_price, 'warnings');
|
||||
}
|
||||
|
||||
// Check if is in sale
|
||||
if (empty($result_product["product"]["status_tosell"])) {
|
||||
setEventMessage($line_id.$langs->trans("ProductStatusNotOnSellShort")." '".$ref_supplier."'", 'warnings');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
elseif ($user_status_code == "PERMISSION_DENIED")
|
||||
{
|
||||
setEventMessage($langs->trans("RemoteUserNotPermission"), 'errors');
|
||||
$error_occurred = true;
|
||||
}
|
||||
elseif ($user_status_code == "BAD_CREDENTIALS")
|
||||
{
|
||||
setEventMessage($langs->trans("RemoteUserBadCredentials"), 'errors');
|
||||
$error_occurred = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
setEventMessage($langs->trans("ResponseNonOK")." '".$user_status_code."'", 'errors');
|
||||
$error_occurred = true;
|
||||
}
|
||||
|
||||
//Form
|
||||
print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
|
||||
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
|
||||
print '<input type="hidden" name="action" value="webservice">';
|
||||
print '<input type="hidden" name="mode" value="send">';
|
||||
print '<input type="hidden" name="ws_user" value="'.$ws_user.'">';
|
||||
print '<input type="hidden" name="ws_password" value="'.$ws_password.'">';
|
||||
print '<input type="hidden" name="ws_entity" value="'.$ws_entity.'">';
|
||||
print '<input type="hidden" name="ws_thirdparty" value="'.$ws_thirdparty.'">';
|
||||
if ($error_occurred)
|
||||
{
|
||||
print "<br>".$langs->trans("ErrorOccurredReviseAndRetry")."<br>";
|
||||
}
|
||||
else
|
||||
{
|
||||
print '<input class="button" type="submit" id="ws_submit" name="ws_submit" value="'.$langs->trans("Confirm").'">';
|
||||
print ' ';
|
||||
}
|
||||
print '<input class="button" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
|
||||
print '</form>';
|
||||
}
|
||||
}
|
||||
/*
|
||||
* Show buttons
|
||||
*/
|
||||
else
|
||||
{
|
||||
/**
|
||||
* Boutons actions
|
||||
@ -1849,6 +2262,13 @@ elseif (! empty($object->id))
|
||||
//}
|
||||
}
|
||||
|
||||
|
||||
// Create a remote order using WebService only if module is activated
|
||||
if (! empty($conf->syncsupplierwebservices->enabled) && $object->statut >= 2) // 2 means accepted
|
||||
{
|
||||
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=webservice&mode=init">'.$langs->trans('CreateRemoteOrder').'</a>';
|
||||
}
|
||||
|
||||
// Cancel
|
||||
if ($object->statut == 2)
|
||||
{
|
||||
@ -1975,112 +2395,6 @@ elseif (! empty($object->id))
|
||||
print '</div></div></div>';
|
||||
}
|
||||
|
||||
/*
|
||||
* Action presend
|
||||
*/
|
||||
if ($action == 'presend')
|
||||
{
|
||||
$ref = dol_sanitizeFileName($object->ref);
|
||||
include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
|
||||
$fileparams = dol_most_recent_file($conf->fournisseur->commande->dir_output . '/' . $ref, preg_quote($ref,'/'));
|
||||
$file=$fileparams['fullname'];
|
||||
|
||||
// Define output language
|
||||
$outputlangs = $langs;
|
||||
$newlang = '';
|
||||
if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
|
||||
$newlang = $_REQUEST['lang_id'];
|
||||
if ($conf->global->MAIN_MULTILANGS && empty($newlang))
|
||||
$newlang = $object->client->default_lang;
|
||||
|
||||
if (!empty($newlang))
|
||||
{
|
||||
$outputlangs = new Translate('', $conf);
|
||||
$outputlangs->setDefaultLang($newlang);
|
||||
$outputlangs->load('commercial');
|
||||
}
|
||||
|
||||
// Build document if it not exists
|
||||
if (! $file || ! is_readable($file))
|
||||
{
|
||||
$result= $object->generateDocument(GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
|
||||
if ($result <= 0)
|
||||
{
|
||||
dol_print_error($db,$result);
|
||||
exit;
|
||||
}
|
||||
$fileparams = dol_most_recent_file($conf->fournisseur->commande->dir_output . '/' . $ref, preg_quote($ref,'/'));
|
||||
$file=$fileparams['fullname'];
|
||||
}
|
||||
|
||||
print '<br>';
|
||||
|
||||
print_titre($langs->trans('SendOrderByMail'));
|
||||
|
||||
// Cree l'objet formulaire mail
|
||||
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
|
||||
$formmail = new FormMail($db);
|
||||
$formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
|
||||
$formmail->fromtype = 'user';
|
||||
$formmail->fromid = $user->id;
|
||||
$formmail->fromname = $user->getFullName($langs);
|
||||
$formmail->frommail = $user->email;
|
||||
$formmail->withfrom=1;
|
||||
$liste=array();
|
||||
foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key=>$value) $liste[$key]=$value;
|
||||
$formmail->withto=GETPOST("sendto")?GETPOST("sendto"):$liste;
|
||||
$formmail->withtocc=$liste;
|
||||
$formmail->withtoccc=(! empty($conf->global->MAIN_EMAIL_USECCC)?$conf->global->MAIN_EMAIL_USECCC:false);
|
||||
$formmail->withtopic=$outputlangs->trans('SendOrderRef','__ORDERREF__');
|
||||
$formmail->withfile=2;
|
||||
$formmail->withbody=1;
|
||||
$formmail->withdeliveryreceipt=1;
|
||||
$formmail->withcancel=1;
|
||||
// Tableau des substitutions
|
||||
$formmail->substit['__ORDERREF__']=$object->ref;
|
||||
$formmail->substit['__SIGNATURE__']=$user->signature;
|
||||
$formmail->substit['__PERSONALIZED__']='';
|
||||
$formmail->substit['__CONTACTCIVNAME__']='';
|
||||
|
||||
//Find the good contact adress
|
||||
$custcontact='';
|
||||
$contactarr=array();
|
||||
$contactarr=$object->liste_contact(-1,'external');
|
||||
|
||||
if (is_array($contactarr) && count($contactarr)>0) {
|
||||
foreach($contactarr as $contact) {
|
||||
if ($contact['libelle']==$langs->trans('TypeContact_order_supplier_external_BILLING')) {
|
||||
require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
|
||||
$contactstatic=new Contact($db);
|
||||
$contactstatic->fetch($contact['id']);
|
||||
$custcontact=$contactstatic->getFullName($langs,1);
|
||||
}
|
||||
}
|
||||
|
||||
if (!empty($custcontact)) {
|
||||
$formmail->substit['__CONTACTCIVNAME__']=$custcontact;
|
||||
}
|
||||
}
|
||||
|
||||
// Tableau des parametres complementaires
|
||||
$formmail->param['action']='send';
|
||||
$formmail->param['models']='order_supplier_send';
|
||||
$formmail->param['orderid']=$object->id;
|
||||
$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
|
||||
|
||||
// Init list of files
|
||||
if (GETPOST("mode")=='init')
|
||||
{
|
||||
$formmail->clear_attached_files();
|
||||
$formmail->add_attached_files($file,basename($file),dol_mimetype($file));
|
||||
}
|
||||
|
||||
// Show form
|
||||
print $formmail->get_form();
|
||||
|
||||
print '<br>';
|
||||
}
|
||||
|
||||
print '</td></tr></table>';
|
||||
}
|
||||
|
||||
|
||||
@ -1114,3 +1114,6 @@ DELETE FROM llx_menu WHERE module = 'boutique';
|
||||
-- Add option always editable on extrafield
|
||||
ALTER TABLE llx_extrafields ADD alwayseditable INTEGER DEFAULT 0 AFTER pos;
|
||||
|
||||
-- add supplier webservice fields
|
||||
ALTER TABLE llx_societe ADD webservices_url varchar(255) DEFAULT NULL;
|
||||
ALTER TABLE llx_societe ADD webservices_key varchar(128) DEFAULT NULL;
|
||||
|
||||
@ -92,4 +92,6 @@ create table llx_societe
|
||||
logo varchar(255),
|
||||
canvas varchar(32), -- type of canvas if used (null by default)
|
||||
import_key varchar(14) -- import key
|
||||
webservices_url varchar(255), -- supplier webservice url
|
||||
webservices_key varchar(128), -- supplier webservice key
|
||||
)ENGINE=innodb;
|
||||
|
||||
@ -334,6 +334,18 @@ class Societe extends CommonObject
|
||||
*/
|
||||
var $import_key;
|
||||
|
||||
/**
|
||||
* Supplier WebServices URL
|
||||
* @var string
|
||||
*/
|
||||
var $webservices_url;
|
||||
|
||||
/**
|
||||
* Supplier WebServices Key
|
||||
* @var string
|
||||
*/
|
||||
var $webservices_key;
|
||||
|
||||
var $logo;
|
||||
var $logo_small;
|
||||
var $logo_mini;
|
||||
@ -715,6 +727,10 @@ class Societe extends CommonObject
|
||||
$supplier=true;
|
||||
}
|
||||
|
||||
//Web services
|
||||
$this->webservices_url = $this->webservices_url?clean_url($this->webservices_url,0):'';
|
||||
$this->webservices_key = trim($this->webservices_key);
|
||||
|
||||
$this->db->begin();
|
||||
|
||||
// Check name is required and codes are ok or unique.
|
||||
@ -795,6 +811,9 @@ class Societe extends CommonObject
|
||||
$sql .= ",default_lang = ".(! empty($this->default_lang)?"'".$this->default_lang."'":"null");
|
||||
$sql .= ",logo = ".(! empty($this->logo)?"'".$this->logo."'":"null");
|
||||
|
||||
$sql .= ",webservices_url = ".(! empty($this->webservices_url)?"'".$this->db->escape($this->webservices_url)."'":"null");
|
||||
$sql .= ",webservices_key = ".(! empty($this->webservices_key)?"'".$this->db->escape($this->webservices_key)."'":"null");
|
||||
|
||||
if ($customer)
|
||||
{
|
||||
$sql .= ", code_client = ".(! empty($this->code_client)?"'".$this->db->escape($this->code_client)."'":"null");
|
||||
@ -951,6 +970,7 @@ class Societe extends CommonObject
|
||||
$sql .= ', s.fk_typent as typent_id';
|
||||
$sql .= ', s.fk_effectif as effectif_id';
|
||||
$sql .= ', s.fk_forme_juridique as forme_juridique_code';
|
||||
$sql .= ', s.webservices_url, s.webservices_key';
|
||||
$sql .= ', s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur, s.parent, s.barcode';
|
||||
$sql .= ', s.fk_departement, s.fk_pays as country_id, s.fk_stcomm, s.remise_client, s.mode_reglement, s.cond_reglement, s.tva_assuj';
|
||||
$sql .= ', s.mode_reglement_supplier, s.cond_reglement_supplier, s.localtax1_assuj, s.localtax1_value, s.localtax2_assuj, s.localtax2_value, s.fk_prospectlevel, s.default_lang, s.logo';
|
||||
@ -1086,6 +1106,9 @@ class Societe extends CommonObject
|
||||
$this->default_lang = $obj->default_lang;
|
||||
$this->logo = $obj->logo;
|
||||
|
||||
$this->webservices_url = $obj->webservices_url;
|
||||
$this->webservices_key = $obj->webservices_key;
|
||||
|
||||
$this->outstanding_limit = $obj->outstanding_limit;
|
||||
|
||||
// multiprix
|
||||
|
||||
@ -119,7 +119,7 @@ if (empty($reshook))
|
||||
$res=$object->setValueFrom('localtax2_value', $value);
|
||||
}
|
||||
|
||||
// Add new third party
|
||||
// Add new or update third party
|
||||
if ((! GETPOST('getcustomercode') && ! GETPOST('getsuppliercode'))
|
||||
&& ($action == 'add' || $action == 'update') && $user->rights->societe->creer)
|
||||
{
|
||||
@ -189,6 +189,10 @@ if (empty($reshook))
|
||||
$object->commercial_id = GETPOST('commercial_id', 'int');
|
||||
$object->default_lang = GETPOST('default_lang');
|
||||
|
||||
// Webservices url/key
|
||||
$object->webservices_url = GETPOST('webservices_url', 'custom', 0, FILTER_SANITIZE_URL);
|
||||
$object->webservices_key = GETPOST('webservices_key', 'san_alpha');
|
||||
|
||||
// Fill array 'array_options' with data from add form
|
||||
$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
|
||||
|
||||
@ -217,6 +221,18 @@ if (empty($reshook))
|
||||
$error++; $errors[] = $langs->trans("ErrorSupplierModuleNotEnabled");
|
||||
$action = ($action=='add'?'create':'edit');
|
||||
}
|
||||
if (! empty($object->webservices_url)) {
|
||||
//Check if has transport, without any the soap client will give error
|
||||
if (strpos($object->webservices_url, "http") === false)
|
||||
{
|
||||
$object->webservices_url = "http://".$object->webservices_url;
|
||||
}
|
||||
if (! isValidUrl($object->webservices_url)) {
|
||||
$langs->load("errors");
|
||||
$error++; $errors[] = $langs->trans("ErrorBadUrl",$object->webservices_url);
|
||||
$action = ($action=='add'?'create':'edit');
|
||||
}
|
||||
}
|
||||
|
||||
// We set country_id, country_code and country for the selected country
|
||||
$object->country_id=GETPOST('country_id')!=''?GETPOST('country_id'):$mysoc->country_id;
|
||||
@ -1179,6 +1195,10 @@ else
|
||||
$object->tva_intra = GETPOST('tva_intra', 'alpha');
|
||||
$object->status = GETPOST('status', 'int');
|
||||
|
||||
// Webservices url/key
|
||||
$object->webservices_url = GETPOST('webservices_url', 'custom', 0, FILTER_SANITIZE_URL);
|
||||
$object->webservices_key = GETPOST('webservices_key', 'san_alpha');
|
||||
|
||||
//Local Taxes
|
||||
$object->localtax1_assuj = GETPOST('localtax1assuj_value');
|
||||
$object->localtax2_assuj = GETPOST('localtax2assuj_value');
|
||||
@ -1558,6 +1578,14 @@ else
|
||||
print $object->showOptionals($extrafields,'edit');
|
||||
}
|
||||
|
||||
// Webservices url/key
|
||||
if (!empty($conf->syncsupplierwebservices->enabled)) {
|
||||
print '<tr><td><label for="webservices_url">'.$langs->trans('WebServiceURL').'</label></td>';
|
||||
print '<td><input type="text" name="webservices_url" id="webservices_url" size="32" value="'.$object->webservices_url.'"></td>';
|
||||
print '<td><label for="webservices_key">'.$langs->trans('WebServiceKey').'</label></td>';
|
||||
print '<td><input type="text" name="webservices_key" id="webservices_key" size="32" value="'.$object->webservices_key.'"></td></tr>';
|
||||
}
|
||||
|
||||
// Logo
|
||||
print '<tr class="hideonsmartphone">';
|
||||
print '<td><label for="photoinput">'.$langs->trans("Logo").'</label></td>';
|
||||
@ -2018,6 +2046,12 @@ else
|
||||
print "</tr>\n";
|
||||
}
|
||||
|
||||
// Webservices url/key
|
||||
if (!empty($conf->syncsupplierwebservices->enabled)) {
|
||||
print '<tr><td>'.$langs->trans("WebServiceURL").'</td><td>'.dol_print_url($object->webservices_url).'</td>';
|
||||
print '<td class="nowrap">'.$langs->trans('WebServiceKey').'</td><td>'.$object->webservices_key.'</td></tr>';
|
||||
}
|
||||
|
||||
print '</table>';
|
||||
|
||||
dol_fiche_end();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user