loviuz/openstamanager
loviuz
/
openstamanager
mirror of https://github.com/devcode-it/openstamanager.git
1
0
Fork 0
Code Issues Releases Activity

Fix #669

This commit is contained in:
Thomas Zilio 2019-11-02 15:41:04 +01:00
parent e901ec9fd1
commit 099e9d53e6
4 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/primanota/add.php
View File

@ -145,9 +145,9 @@ foreach ($id_documenti as $id_documento) {
}
$k = 0;
foreach($righe_azienda AS $key => $riga_azienda){
if($righe_azienda[$key]['id_conto']!=$righe_azienda[$key-1]['id_conto']){
$k++;
foreach ($righe_azienda as $key => $riga_azienda) {
if ($righe_azienda[$key]['id_conto'] != $righe_azienda[$key - 1]['id_conto']) {
++$k;
}
$riga_documento[$k]['id_conto'] = $riga_azienda['id_conto'];

4
modules/primanota/src/Mastrino.php
View File

@ -132,12 +132,12 @@ class Mastrino extends Model
$movimenti = $documento->movimentiContabili;
if($dir=='entrata'){
if ($dir == 'entrata') {
$totale_movimenti = $movimenti->where('totale', '<', 0)->where('is_insoluto', 0)->sum('totale');
$totale_insoluto = $movimenti->where('totale', '<', 0)->where('is_insoluto', 1)->sum('totale');
}
if($dir=='uscita'){
if ($dir == 'uscita') {
$totale_movimenti = $movimenti->where('totale', '>', 0)->where('is_insoluto', 0)->sum('totale');
$totale_insoluto = $movimenti->where('totale', '>', 0)->where('is_insoluto', 1)->sum('totale');
}

20
src/Modules.php
View File

@ -106,7 +106,7 @@ class Modules
*
* @return string
*/
public static function getAdditionals($module)
public static function getAdditionals($module, $include_segments = true)
{
$module = self::get($module);
$user = Auth::user();
@ -127,13 +127,15 @@ class Modules
}
// Aggiunta dei segmenti
$segments = self::getSegments($module['id']);
$id_segment = $_SESSION['module_'.$module['id']]['id_segment'];
foreach ($segments as $result) {
if (!empty($result['clause']) && $result['id'] == $id_segment) {
$result['clause'] = Util\Query::replacePlaceholder($result['clause']);
if ($include_segments) {
$segments = self::getSegments($module['id']);
$id_segment = $_SESSION['module_'.$module['id']]['id_segment'];
foreach ($segments as $result) {
if (!empty($result['clause']) && $result['id'] == $id_segment) {
$result['clause'] = Util\Query::replacePlaceholder($result['clause']);
$additionals[$result['position']][] = $result['clause'];
$additionals[$result['position']][] = $result['clause'];
}
}
}
@ -174,9 +176,9 @@ class Modules
*
* @return array
*/
public static function getAdditionalsQuery($module, $type = null)
public static function getAdditionalsQuery($module, $type = null, $include_segments = true)
{
$array = self::getAdditionals($module);
$array = self::getAdditionals($module, $include_segments);
if (!empty($type) && isset($array[$type])) {
$result = (array) $array[$type];
} else {

4
src/Util/Query.php
View File

@ -204,7 +204,7 @@ class Query
// Ordinamento dei risultati
if (isset($order['dir']) && isset($order['column'])) {
$pos = array_search($order['column'], total['fields']);
$pos = array_search($order['column'], $total['fields']);
if ($pos !== false) {
$pieces = explode('ORDER', $query);
@ -328,7 +328,7 @@ class Query
$query = $element['option'];
// Aggiunta eventuali filtri dai segmenti per eseguire la query filtrata
$query = str_replace('1=1', '1=1 '.Modules::getAdditionalsQuery($element['attributes']['name']), $query);
$query = str_replace('1=1', '1=1 '.Modules::getAdditionalsQuery($element['attributes']['name'], null, false), $query);
$views = self::getViews($element);
$select = [];