OpenEcoLab-LasAlpujarras/farmOS
3
0
Fork 0
mirror of https://github.com/farmOS/farmOS.git synced 2024-02-23 11:37:38 +01:00
Code Wiki Activity

Default the inventory of "individual" assets to 1.

Browse source
This commit is contained in:
Michael Stenta 2017-10-12 12:17:04 -04:00
parent 9360563ed8
commit 41c9c9e516
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
modules/farm/farm_inventory/farm_inventory.module
View file

@ -26,6 +26,12 @@ function farm_inventory_entity_view_alter(&$build, $type) {
// Get the asset's inventory. // Get the asset's inventory.
$inventory = farm_inventory($asset); $inventory = farm_inventory($asset);
// If the inventory is an empty string, and the asset is treated as an
// individual, then set the inventory to 1.
if ($inventory == '' && farm_inventory_individual($asset)) {
$inventory = '1';
}
// Build the inventory display. // Build the inventory display.
$output = '<strong>' . t('Inventory') . ':</strong> ' . $inventory; $output = '<strong>' . t('Inventory') . ':</strong> ' . $inventory;
@ -261,7 +267,8 @@ function farm_inventory_individual(FarmAsset $asset) {
* Defaults to TRUE. * Defaults to TRUE.
* *
* @return string * @return string
* Returns the asset's inventory as a string. * Returns the asset's inventory as a string. If no inventory adjustments
* exist for the asset, an empty string will be returned.
*/ */
function farm_inventory(FarmAsset $asset, $time = REQUEST_TIME, $done = TRUE) { function farm_inventory(FarmAsset $asset, $time = REQUEST_TIME, $done = TRUE) {
@ -278,6 +285,13 @@ function farm_inventory(FarmAsset $asset, $time = REQUEST_TIME, $done = TRUE) {
$result = $query->execute(); $result = $query->execute();
$inventory = $result->fetchField(); $inventory = $result->fetchField();
// If there are no inventory adjustments, return an empty string. Note that
// we use is_null($inventory) instead of empty($inventory), because empty()
// would be TRUE if the inventory is set to 0.
if (is_null($inventory)) {
return '';
}
// Add zero (to remove trailing zeroes). // Add zero (to remove trailing zeroes).
// See https://stackoverflow.com/questions/14531679/remove-useless-zero-digits-from-decimals-in-php // See https://stackoverflow.com/questions/14531679/remove-useless-zero-digits-from-decimals-in-php
$inventory += 0; $inventory += 0;