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

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2018-11-08 20:19:45 +01:00
commit 9d15f83f4c
13 changed files with 6526 additions and 6527 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/adherents/index.php
View File

@ -55,7 +55,7 @@ $AdherentsResilies=array();
$AdherentType=array();
// Liste les adherents
// Members list
$sql = "SELECT t.rowid, t.libelle as label, t.subscription,";
$sql.= " d.statut, count(d.rowid) as somme";
$sql.= " FROM ".MAIN_DB_PREFIX."adherent_type as t";
@ -92,7 +92,7 @@ if ($result)
$now=dol_now();
// List members up to date
// Members up to date list
// current rule: uptodate = the end date is in future whatever is type
// old rule: uptodate = if type does not need payment, that end date is null, if type need payment that end date is in future)
$sql = "SELECT count(*) as somme , d.fk_adherent_type";
@ -140,7 +140,7 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) // This is usele
foreach($listofsearchfields as $key => $value)
{
if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
print '<tr '.$bc[false].'>';
print '<tr class="oddeven">';
print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label>:</td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
print '</tr>';

5
htdocs/api/class/api_documents.class.php
View File

@ -103,7 +103,7 @@ class Documents extends DolibarrApi
}
$file_content=file_get_contents($original_file_osencoded);
return array('filename'=>$filename, 'content'=>base64_encode($file_content), 'encoding'=>'MIME base64 (base64_encode php function, http://php.net/manual/en/function.base64-encode.php)' );
return array('filename'=>$filename, 'content-type' => dol_mimetype($filename), 'filesize'=>filesize($original_file), 'content'=>base64_encode($file_content), 'encoding'=>'base64' );
}
@ -224,10 +224,9 @@ class Documents extends DolibarrApi
}
$file_content=file_get_contents($original_file_osencoded);
return array('filename'=>$filename, 'content'=>base64_encode($file_content), 'langcode'=>$outputlangs->defaultlang, 'template'=>$templateused, 'encoding'=>'MIME base64 (base64_encode php function, http://php.net/manual/en/function.base64-encode.php)' );
return array('filename'=>$filename, 'content-type' => dol_mimetype($filename), 'filesize'=>filesize($original_file), 'content'=>base64_encode($file_content), 'langcode'=>$outputlangs->defaultlang, 'template'=>$templateused, 'encoding'=>'base64' );
}
/**
* Return the list of documents of a dedicated element (from its ID or Ref)
*

1
htdocs/contact/list.php
View File

@ -321,6 +321,7 @@ if (strlen($search_twitter)) $sql.= natural_search('p.twitter', $search_t
if (strlen($search_facebook)) $sql.= natural_search('p.facebook', $search_facebook);
if (strlen($search_email)) $sql.= natural_search('p.email', $search_email);
if (strlen($search_zip)) $sql.= natural_search("p.zip",$search_zip);
if (strlen($search_town)) $sql.= natural_search("p.town",$search_town);
if ($search_status != '' && $search_status >= 0) $sql.= " AND p.statut = ".$db->escape($search_status);
if ($search_import_key) $sql.= natural_search("p.import_key",$search_import_key);
if ($type == "o") // filtre sur type

10
htdocs/core/class/html.formfile.class.php
View File

@ -1219,9 +1219,13 @@ class FormFile
if (! dol_is_file($file['path'].'/'.$minifile)) $minifile=getImageFileNameForSize($file['name'], '_mini', '.png'); // For backward compatibility of old thumbs that were created with filename in lower case and with .png extension
//print $file['path'].'/'.$minifile.'<br>';
$urlforhref=getAdvancedPreviewUrl($modulepart, $relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 0, '&entity='.(!empty($object->entity)?$object->entity:$conf->entity));
if (empty($urlforhref)) $urlforhref=DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity)?$object->entity:$conf->entity).'&file='.urlencode($relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']));
print '<a href="'.$urlforhref.'" class="aphoto" target="_blank">';
$urlforhref=getAdvancedPreviewUrl($modulepart, $relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 1, '&entity='.(!empty($object->entity)?$object->entity:$conf->entity));
if (empty($urlforhref)) {
$urlforhref=DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity)?$object->entity:$conf->entity).'&file='.urlencode($relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']));
print '<a href="'.$urlforhref.'" class="aphoto" target="_blank">';
} else {
print '<a href="'.$urlforhref['url'].'" class="'.$urlforhref['css'].'" target="'.$urlforhref['target'].'" mime="'.$urlforhref['mime'].'">';
}
print '<img border="0" height="'.$maxheightmini.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity)?$object->entity:$conf->entity).'&file='.urlencode($relativepath.$minifile).'" title="">';
print '</a>';
}

2
htdocs/core/js/lib_head.js.php
View File

@ -918,7 +918,7 @@ function document_preview(file, type, title)
{
optionsbuttons = {
"<?php echo dol_escape_js($langs->transnoentitiesnoconv("OriginalSize")); ?>": function() { console.log("Click on original size"); jQuery(".ui-dialog-content.ui-widget-content > object").css({ "max-height": "none" }); },
"<?php echo dol_escape_js($langs->transnoentitiesnoconv("Close")); ?>": function() { $( this ).dialog( "close" ); }
"<?php echo dol_escape_js($langs->transnoentitiesnoconv("CloseWindow")); ?>": function() { $( this ).dialog( "close" ); }
};
}

3979
htdocs/core/modules/DolibarrModules.class.php
View File

File diff suppressed because it is too large Load Diff

7
htdocs/fichinter/card.php
View File

@ -7,6 +7,7 @@
* Copyright (C) 2014-2018 Ferran Marcet <fmarcet@2byte.es>
* Copyright (C) 2014-2018 Charlene Benke <charlies@patas-monkey.com>
* Copyright (C) 2015-2016 Abbes Bahfir <bafbes@gmail.com>
* Copyright (C) 2018 Philippe Grand <philippe.grand@atoo-net.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
@ -1646,10 +1647,12 @@ else if ($id > 0 || ! empty($ref))
else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#">'.$langs->trans('SendMail').'</a></div>';
}
// create interventional model
// create intervention model
if ($object->statut == Fichinter::STATUS_DRAFT && $user->rights->ficheinter->creer && (count($object->lines) > 0)) {
print '<div class="inline-block divButAction">';
print '<a class="butAction" href="'.DOL_URL_ROOT.'/fichinter/card-rec.php?id='.$object->id.'&action=create">'.$langs->trans("ChangeIntoRepeatableInterventional").'</a>';
// This feature is not yet implemented
//print '<a class="butAction" href="'.DOL_URL_ROOT.'/fichinter/card-rec.php?id='.$object->id.'&action=create">'.$langs->trans("ChangeIntoRepeatableIntervention").'</a>';
print '<a class="butAction" title="'.$langs->trans("ChangeIntoRepeatableIntervention").'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">'.$langs->trans("not yet implemented").'</a>';
print '</div>';
}

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

@ -4,6 +4,7 @@ Interventions=Interventions
InterventionCard=Intervention card
NewIntervention=New intervention
AddIntervention=Create intervention
ChangeIntoRepeatableIntervention=Change to repeatable intervention
ListOfInterventions=List of interventions
ActionsOnFicheInter=Actions on intervention
LastInterventions=Latest %s interventions

1
htdocs/main.inc.php
View File

@ -1382,7 +1382,6 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
}
else
{
if (! preg_match('/^\//',$jsfile)) $jsfile='/'.$jsfile; // For backward compatibility
print '<script type="text/javascript" src="'.dol_buildpath($jsfile,1).'"></script>'."\n";
}
}

395
htdocs/product/class/api_products.class.php
View File

@ -46,44 +46,52 @@ class Products extends DolibarrApi
*/
function __construct()
{
global $db, $conf;
$this->db = $db;
global $db, $conf;
$this->db = $db;
$this->product = new Product($this->db);
}
/**
* Get properties of a product object
* Get properties of a product object (from its ID, Ref, Ref_ext or Barcode)
*
* Return an array with product information.
* TODO implement getting a product by ref or by $ref_ext
*
* @param int $id ID of product
* @param int $includestockdata Load also information about stock (slower)
* @return array|mixed Data without useless information
*
* @param int $id ID of product
* @param string $ref Ref of element
* @param string $ref_ext Ref ext of element
* @param string $barcode Barcode of element
* @param int $includestockdata Load also information about stock (slower)
* @return array|mixed Data without useless information
*
* @throws 401
* @throws 403
* @throws 404
*/
function get($id, $includestockdata=0)
function get($id, $ref='', $ref_ext='', $barcode='', $includestockdata=0)
{
if(! DolibarrApiAccess::$user->rights->produit->lire) {
throw new RestException(403);
}
$result = $this->product->fetch($id);
if( ! $result ) {
throw new RestException(404, 'Product not found');
if (empty($id) && empty($ref) && empty($ref_ext) && empty($barcode)) {
throw new RestException(400, 'bad value for parameter id, ref, ref_ext or barcode');
}
if( ! DolibarrApi::_checkAccessToResource('product',$this->product->id)) {
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
}
$id = (empty($id)?0:$id);
if(! DolibarrApiAccess::$user->rights->produit->lire) {
throw new RestException(403);
}
if ($includestockdata)
{
$this->product->load_stock();
}
$result = $this->product->fetch($id, $ref, $ref_ext, $barcode);
if(! $result ) {
throw new RestException(404, 'Product not found');
}
if(! DolibarrApi::_checkAccessToResource('product', $this->product->id)) {
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
}
if ($includestockdata) {
$this->product->load_stock();
}
return $this->_cleanObjectDatas($this->product);
}
@ -93,13 +101,13 @@ class Products extends DolibarrApi
*
* Get a list of products
*
* @param string $sortfield Sort field
* @param string $sortorder Sort order
* @param int $limit Limit for list
* @param int $page Page number
* @param int $mode Use this param to filter list (0 for all, 1 for only product, 2 for only service)
* @param int $category Use this param to filter list by category
* @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.tobuy:=:0) and (t.tosell:=:1)"
* @param string $sortfield Sort field
* @param string $sortorder Sort order
* @param int $limit Limit for list
* @param int $page Page number
* @param int $mode Use this param to filter list (0 for all, 1 for only product, 2 for only service)
* @param int $category Use this param to filter list by category
* @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.tobuy:=:0) and (t.tosell:=:1)"
* @return array Array of product objects
*/
function index($sortfield = "t.ref", $sortorder = 'ASC', $limit = 100, $page = 0, $mode=0, $category=0, $sqlfilters = '')
@ -112,36 +120,33 @@ class Products extends DolibarrApi
$sql = "SELECT t.rowid, t.ref, t.ref_ext";
$sql.= " FROM ".MAIN_DB_PREFIX."product as t";
if ($category > 0)
{
if ($category > 0) {
$sql.= ", ".MAIN_DB_PREFIX."categorie_product as c";
}
$sql.= ' WHERE t.entity IN ('.getEntity('product').')';
// Select products of given category
if ($category > 0)
{
if ($category > 0) {
$sql.= " AND c.fk_categorie = ".$db->escape($category);
$sql.= " AND c.fk_product = t.rowid ";
}
// Show products
if ($mode == 1) $sql.= " AND t.fk_product_type = 0";
if ($mode == 1) { $sql.= " AND t.fk_product_type = 0";
}
// Show services
if ($mode == 2) $sql.= " AND t.fk_product_type = 1";
if ($mode == 2) { $sql.= " AND t.fk_product_type = 1";
}
// Add sql filters
if ($sqlfilters)
{
if (! DolibarrApi::_checkFilters($sqlfilters))
{
if ($sqlfilters) {
if (! DolibarrApi::_checkFilters($sqlfilters)) {
throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
}
$regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
$regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
$sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
}
$sql.= $db->order($sortfield, $sortorder);
if ($limit) {
if ($page < 0)
{
if ($limit) {
if ($page < 0) {
$page = 0;
}
$offset = $limit * $page;
@ -150,8 +155,7 @@ class Products extends DolibarrApi
}
$result = $db->query($sql);
if ($result)
{
if ($result) {
$num = $db->num_rows($result);
$min = min($num, ($limit <= 0 ? $num : $limit));
while ($i < $min)
@ -167,7 +171,7 @@ class Products extends DolibarrApi
else {
throw new RestException(503, 'Error when retrieve product list : '.$db->lasterror());
}
if( ! count($obj_ret)) {
if(! count($obj_ret)) {
throw new RestException(404, 'No product found');
}
return $obj_ret;
@ -176,14 +180,14 @@ class Products extends DolibarrApi
/**
* Create product object
*
* @param array $request_data Request data
* @return int ID of product
* @param array $request_data Request data
* @return int ID of product
*/
function post($request_data = null)
{
if(! DolibarrApiAccess::$user->rights->produit->creer) {
throw new RestException(401);
}
throw new RestException(401);
}
// Check mandatory fields
$result = $this->_validate($request_data);
@ -201,8 +205,8 @@ class Products extends DolibarrApi
* Update product.
* Price will be updated by this API only if option is set on "One price per product". See other APIs for other price modes.
*
* @param int $id Id of product to update
* @param array $request_data Datas
* @param int $id Id of product to update
* @param array $request_data Datas
* @return int
*
* @throws RestException
@ -211,99 +215,102 @@ class Products extends DolibarrApi
*/
function put($id, $request_data = null)
{
global $conf;
global $conf;
if(! DolibarrApiAccess::$user->rights->produit->creer) {
throw new RestException(401);
}
throw new RestException(401);
}
$result = $this->product->fetch($id);
if( ! $result ) {
if(! $result ) {
throw new RestException(404, 'Product not found');
}
if( ! DolibarrApi::_checkAccessToResource('product',$this->product->id)) {
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
}
if(! DolibarrApi::_checkAccessToResource('product', $this->product->id)) {
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
}
$oldproduct = dol_clone($this->product, 0);
$oldproduct = dol_clone($this->product, 0);
foreach($request_data as $field => $value) {
if ($field == 'id') continue;
if ($field == 'id') { continue;
}
$this->product->$field = $value;
}
$result = $this->product->update($id, DolibarrApiAccess::$user, 1, 'update');
// If price mode is 1 price per product
if ($result > 0 && ! empty($conf->global->PRODUCT_PRICE_UNIQ))
{
// We update price only if it was changed
$pricemodified = false;
if ($this->product->price_base_type != $oldproduct->price_base_type) $pricemodified = true;
else
{
if ($this->product->tva_tx != $oldproduct->tva_tx) $pricemodified = true;
if ($this->product->tva_npr != $oldproduct->tva_npr) $pricemodified = true;
if ($this->product->default_vat_code != $oldproduct->default_vat_code) $pricemodified = true;
if ($result > 0 && ! empty($conf->global->PRODUCT_PRICE_UNIQ)) {
// We update price only if it was changed
$pricemodified = false;
if ($this->product->price_base_type != $oldproduct->price_base_type) { $pricemodified = true;
} else
{
if ($this->product->tva_tx != $oldproduct->tva_tx) { $pricemodified = true;
}
if ($this->product->tva_npr != $oldproduct->tva_npr) { $pricemodified = true;
}
if ($this->product->default_vat_code != $oldproduct->default_vat_code) { $pricemodified = true;
}
if ($this->product->price_base_type == 'TTC')
{
if ($this->product->price_ttc != $oldproduct->price_ttc) $pricemodified = true;
if ($this->product->price_min_ttc != $oldproduct->price_min_ttc) $pricemodified = true;
}
else
{
if ($this->product->price != $oldproduct->price) $pricemodified = true;
if ($this->product->price_min != $oldproduct->price_min) $pricemodified = true;
}
}
if ($this->product->price_base_type == 'TTC') {
if ($this->product->price_ttc != $oldproduct->price_ttc) { $pricemodified = true;
}
if ($this->product->price_min_ttc != $oldproduct->price_min_ttc) { $pricemodified = true;
}
}
else
{
if ($this->product->price != $oldproduct->price) { $pricemodified = true;
}
if ($this->product->price_min != $oldproduct->price_min) { $pricemodified = true;
}
}
}
if ($pricemodified)
{
$newvat = $this->product->tva_tx;
$newnpr = $this->product->tva_npr;
$newvatsrccode = $this->product->default_vat_code;
if ($pricemodified) {
$newvat = $this->product->tva_tx;
$newnpr = $this->product->tva_npr;
$newvatsrccode = $this->product->default_vat_code;
$newprice = $this->product->price;
$newpricemin = $this->product->price_min;
if ($this->product->price_base_type == 'TTC')
{
$newprice = $this->product->price_ttc;
$newpricemin = $this->product->price_min_ttc;
}
$newprice = $this->product->price;
$newpricemin = $this->product->price_min;
if ($this->product->price_base_type == 'TTC') {
$newprice = $this->product->price_ttc;
$newpricemin = $this->product->price_min_ttc;
}
$result = $this->product->updatePrice($newprice, $this->product->price_base_type, DolibarrApiAccess::$user, $newvat, $newpricemin, 0, $newnpr, 0, 0, array(), $newvatsrccode);
}
$result = $this->product->updatePrice($newprice, $this->product->price_base_type, DolibarrApiAccess::$user, $newvat, $newpricemin, 0, $newnpr, 0, 0, array(), $newvatsrccode);
}
}
if ($result <= 0)
{
throw new RestException(500, "Error updating product", array_merge(array($this->product->error), $this->product->errors));
}
if ($result <= 0) {
throw new RestException(500, "Error updating product", array_merge(array($this->product->error), $this->product->errors));
}
return $this->get($id);
return $this->get($id);
}
/**
* Delete product
*
* @param int $id Product ID
* @return array
* @param int $id Product ID
* @return array
*/
function delete($id)
{
if(! DolibarrApiAccess::$user->rights->produit->supprimer) {
throw new RestException(401);
}
throw new RestException(401);
}
$result = $this->product->fetch($id);
if( ! $result ) {
if(! $result ) {
throw new RestException(404, 'Product not found');
}
if( ! DolibarrApi::_checkAccessToResource('product',$this->product->id)) {
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
}
if(! DolibarrApi::_checkAccessToResource('product', $this->product->id)) {
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
}
// The Product::delete() method uses the global variable $user.
global $user;
@ -316,41 +323,41 @@ class Products extends DolibarrApi
/**
* Get categories for a product
*
* @param int $id ID of product
* @param string $sortfield Sort field
* @param string $sortorder Sort order
* @param int $limit Limit for list
* @param int $page Page number
* @param int $id ID of product
* @param string $sortfield Sort field
* @param string $sortorder Sort order
* @param int $limit Limit for list
* @param int $page Page number
*
* @return mixed
*
* @url GET {id}/categories
*/
function getCategories($id, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
{
if (! DolibarrApiAccess::$user->rights->categorie->lire) {
throw new RestException(401);
}
function getCategories($id, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
{
if (! DolibarrApiAccess::$user->rights->categorie->lire) {
throw new RestException(401);
}
$categories = new Categorie($this->db);
$categories = new Categorie($this->db);
$result = $categories->getListForItem($id, 'product', $sortfield, $sortorder, $limit, $page);
$result = $categories->getListForItem($id, 'product', $sortfield, $sortorder, $limit, $page);
if (empty($result)) {
throw new RestException(404, 'No category found');
}
if (empty($result)) {
throw new RestException(404, 'No category found');
}
if ($result < 0) {
throw new RestException(503, 'Error when retrieve category list : '.array_merge(array($categories->error), $categories->errors));
}
if ($result < 0) {
throw new RestException(503, 'Error when retrieve category list : '.array_merge(array($categories->error), $categories->errors));
}
return $result;
return $result;
}
/**
* Get prices per segment for a product
*
* @param int $id ID of product
* @param int $id ID of product
*
* @return mixed
*
@ -358,41 +365,40 @@ class Products extends DolibarrApi
*/
function getCustomerPricesPerSegment($id)
{
global $conf;
global $conf;
if (! DolibarrApiAccess::$user->rights->produit->lire) {
throw new RestException(401);
}
if (! DolibarrApiAccess::$user->rights->produit->lire) {
throw new RestException(401);
}
if (empty($conf->global->PRODUIT_MULTIPRICES))
{
throw new RestException(400, 'API not available: this mode of pricing is not enabled by setup');
}
if (empty($conf->global->PRODUIT_MULTIPRICES)) {
throw new RestException(400, 'API not available: this mode of pricing is not enabled by setup');
}
$result = $this->product->fetch($id);
if ( ! $result ) {
throw new RestException(404, 'Product not found');
}
$result = $this->product->fetch($id);
if (! $result ) {
throw new RestException(404, 'Product not found');
}
if ($result < 0) {
throw new RestException(503, 'Error when retrieve prices list : '.array_merge(array($this->product->error), $this->product->errors));
}
if ($result < 0) {
throw new RestException(503, 'Error when retrieve prices list : '.array_merge(array($this->product->error), $this->product->errors));
}
return array(
'multiprices'=>$this->product->multiprices,
'multiprices_inc_tax'=>$this->product->multiprices_ttc,
'multiprices_min'=>$this->product->multiprices_min,
'multiprices_min_inc_tax'=>$this->product->multiprices_min_ttc,
'multiprices_vat'=>$this->product->multiprices_tva_tx,
'multiprices_base_type'=>$this->product->multiprices_base_type,
//'multiprices_default_vat_code'=>$this->product->multiprices_default_vat_code
);
return array(
'multiprices'=>$this->product->multiprices,
'multiprices_inc_tax'=>$this->product->multiprices_ttc,
'multiprices_min'=>$this->product->multiprices_min,
'multiprices_min_inc_tax'=>$this->product->multiprices_min_ttc,
'multiprices_vat'=>$this->product->multiprices_tva_tx,
'multiprices_base_type'=>$this->product->multiprices_base_type,
//'multiprices_default_vat_code'=>$this->product->multiprices_default_vat_code
);
}
/**
* Get prices per customer for a product
*
* @param int $id ID of product
* @param int $id ID of product
*
* @return mixed
*
@ -400,34 +406,33 @@ class Products extends DolibarrApi
*/
function getCustomerPricesPerCustomer($id)
{
global $conf;
global $conf;
if (! DolibarrApiAccess::$user->rights->produit->lire) {
throw new RestException(401);
}
if (! DolibarrApiAccess::$user->rights->produit->lire) {
throw new RestException(401);
}
if (empty($conf->global->PRODUIT_CUSTOMER_PRICES))
{
throw new RestException(400, 'API not available: this mode of pricing is not enabled by setup');
}
if (empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
throw new RestException(400, 'API not available: this mode of pricing is not enabled by setup');
}
$result = $this->product->fetch($id);
if ( ! $result ) {
throw new RestException(404, 'Product not found');
}
$result = $this->product->fetch($id);
if (! $result ) {
throw new RestException(404, 'Product not found');
}
if ($result < 0) {
throw new RestException(503, 'Error when retrieve prices list : '.array_merge(array($this->product->error), $this->product->errors));
}
if ($result < 0) {
throw new RestException(503, 'Error when retrieve prices list : '.array_merge(array($this->product->error), $this->product->errors));
}
throw new RestException(501, 'Feature not yet available');
//return $result;
throw new RestException(501, 'Feature not yet available');
//return $result;
}
/**
* Get prices per quantity for a product
*
* @param int $id ID of product
* @param int $id ID of product
*
* @return mixed
*
@ -435,38 +440,37 @@ class Products extends DolibarrApi
*/
function getCustomerPricesPerQuantity($id)
{
global $conf;
global $conf;
if (! DolibarrApiAccess::$user->rights->produit->lire) {
throw new RestException(401);
}
if (! DolibarrApiAccess::$user->rights->produit->lire) {
throw new RestException(401);
}
if (empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY))
{
throw new RestException(400, 'API not available: this mode of pricing is not enabled by setup');
}
if (empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) {
throw new RestException(400, 'API not available: this mode of pricing is not enabled by setup');
}
$result = $this->product->fetch($id);
if ( ! $result ) {
throw new RestException(404, 'Product not found');
}
$result = $this->product->fetch($id);
if (! $result ) {
throw new RestException(404, 'Product not found');
}
if ($result < 0) {
throw new RestException(503, 'Error when retrieve prices list : '.array_merge(array($this->product->error), $this->product->errors));
}
if ($result < 0) {
throw new RestException(503, 'Error when retrieve prices list : '.array_merge(array($this->product->error), $this->product->errors));
}
return array(
'prices_by_qty'=>$this->product->prices_by_qty[0], // 1 if price by quantity was activated for the product
'prices_by_qty_list'=>$this->product->prices_by_qty_list[0]
);
return array(
'prices_by_qty'=>$this->product->prices_by_qty[0], // 1 if price by quantity was activated for the product
'prices_by_qty_list'=>$this->product->prices_by_qty_list[0]
);
}
/**
* Clean sensible object datas
*
* @param object $object Object to clean
* @return array Array of cleaned object properties
* @param object $object Object to clean
* @return array Array of cleaned object properties
*/
function _cleanObjectDatas($object)
{
@ -492,7 +496,7 @@ class Products extends DolibarrApi
/**
* Validate fields before create or update object
*
* @param array $data Datas to validate
* @param array $data Datas to validate
* @return array
* @throws RestException
*/
@ -500,8 +504,9 @@ class Products extends DolibarrApi
{
$product = array();
foreach (Products::$FIELDS as $field) {
if (!isset($data[$field]))
if (!isset($data[$field])) {
throw new RestException(400, "$field field missing");
}
$product[$field] = $data[$field];
}
return $product;

8593
htdocs/product/class/product.class.php
View File

File diff suppressed because it is too large Load Diff

45
htdocs/stripe/payment.php
View File

@ -8,7 +8,7 @@
* Copyright (C) 2014 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
* Copyright (C) 2014 Teddy Andreotti <125155@supinfo.com>
* Copyright (C) 2015 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2018 ThibaultFOUCART <support@ptibogxiv.net>
* Copyright (C) 2018 Thibault FOUCART <support@ptibogxiv.net>
* Copyright (C) 2018 Frédéric France <frederic.france@netlogic.fr>
*
* This program is free software; you can redistribute it and/or modify
@ -63,21 +63,6 @@ $addwarning=0;
$multicurrency_amounts=array();
$multicurrency_amountsresttopay=array();
if (! empty($conf->stripe->enabled))
{
$service = 'StripeTest';
$servicestatus = 0;
if (! empty($conf->global->STRIPE_LIVE) && ! GETPOST('forcesandbox','alpha'))
{
$service = 'StripeLive';
$servicestatus = 0;
}
$stripe = new Stripe($db);
$stripeacc = $stripe->getStripeAccount($service); // Stripe OAuth connect account of dolibarr user (no network access here)
$stripecu = $stripe->getStripeCustomerAccount($object->id, $servicestatus); // Get thirdparty cu_...
}
// Security check
$socid=0;
if ($user->societe_id > 0)
@ -93,6 +78,20 @@ if ($facid > 0)
$ret=$object->fetch($facid);
}
if (! empty($conf->stripe->enabled))
{
$service = 'StripeTest';
$servicestatus = 0;
if (! empty($conf->global->STRIPE_LIVE) && ! GETPOST('forcesandbox','alpha'))
{
$service = 'StripeLive';
$servicestatus = 0;
}
$stripe=new Stripe($db);
$stripeacc = $stripe->getStripeAccount($service); // Stripe OAuth connect account of dolibarr user (no network access here)
}
// Initialize technical object to manage hooks of paiements. Note that conf->hooks_modules contains array array
$hookmanager->initHooks(array('paiementcard','globalcard'));
@ -307,12 +306,16 @@ if (empty($reshook))
$paiementcode ="CB";
}
}
$societe = new Societe($db);
$societe->fetch($facture->socid);
dol_syslog("Create charge", LOG_DEBUG, 0, '_stripe');
dol_syslog("Create charge", LOG_DEBUG, 0, '_stripe');
$stripecu = $stripe->getStripeCustomerAccount($societe->id, $servicestatus); // Get thirdparty cu_...
$charge=$stripe->CreatePaymentStripe($stripeamount,"EUR","invoice",$facid,$source,$customer->id,$stripe->getStripeAccount($conf->entity));
$charge=$stripe->createPaymentStripe($stripeamount,$facture->multicurrency_code,"invoice",$facid,$source,$stripecu,$stripeacc,$servicestatus);
if (!$error)
{
@ -324,6 +327,8 @@ if (empty($reshook))
$paiement->paiementid = dol_getIdFromCode($db,$paiementcode,'c_paiement');
$paiement->num_paiement = $charge->message;
$paiement->note = GETPOST('comment');
$paiement->ext_payment_id = $charge->id;
$paiement->ext_payment_site = $service;
}
if (! $error)
@ -388,8 +393,8 @@ if (empty($reshook))
exit;
}
else
{
$loc = DOL_URL_ROOT.'/stripeconnect/payment.php?facid='.$facid.'&action=create&error='.$e->getMessage();
{
$loc = DOL_URL_ROOT.'/stripe/payment.php?facid='.$facid.'&action=create&error='.$charge->message;
$db->rollback();
header('Location: '.$loc);

8
htdocs/ticket/class/actions_ticket.class.php
View File

@ -827,6 +827,7 @@ class ActionsTicket
global $mysoc, $conf, $langs;
$object = new Ticket($this->db);
$error = 0;
$ret = $object->fetch('', '', GETPOST('track_id','alpha'));
$object->socid = $object->fk_soc;
@ -1203,15 +1204,14 @@ class ActionsTicket
public function viewTicketMessages($show_private, $show_user = true)
{
global $conf, $langs, $user;
global $object;
// Load logs in cache
$ret = $object->loadCacheMsgsTicket();
$ret = $this->dao->loadCacheMsgsTicket();
$action = GETPOST('action');
$this->viewTicketOriginalMessage($user, $action);
if (is_array($object->cache_msgs_ticket) && count($object->cache_msgs_ticket) > 0) {
if (is_array($this->dao->cache_msgs_ticket) && count($this->dao->cache_msgs_ticket) > 0) {
print_titre($langs->trans('TicketMailExchanges'));
print '<table class="border" style="width:100%;">';
@ -1228,7 +1228,7 @@ class ActionsTicket
print '</td>';
}
foreach ($object->cache_msgs_ticket as $id => $arraymsgs) {
foreach ($this->dao->cache_msgs_ticket as $id => $arraymsgs) {
if (!$arraymsgs['private']
|| ($arraymsgs['private'] == "1" && $show_private)
) {