Skip to content

Fetching Quantity through database #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rigidsphp wants to merge 2 commits into
base: 7.x-2.x
Choose a base branch
from
Open

Fetching Quantity through database #48

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15a4e24
Fetching Quantity through database
rigidsphp May 8, 2017
69917a8
Fixed spacing issues
rigidsphp May 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions modules/report/includes/commerce_pos_report.pages.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -801,7 +801,7 @@ function commerce_pos_report_build_journal_role_table(array $filters = array())
array('data' => t('Discount')),
array(
'data' => t('Order Total'),
'field' => 'ot.commerce_order_total_amount'
'field' => 'ot.commerce_order_total_amount',
),
);

Expand Down Expand Up @@ -836,11 +836,12 @@ function commerce_pos_report_build_journal_role_table(array $filters = array())
$query->fields('ot', array(
'commerce_order_total_amount',
'commerce_order_total_currency_code',
'commerce_order_total_data'
'commerce_order_total_data',
));

// Join line item data.
$query->join('commerce_line_item', 'l', 'l.order_id = t.order_id');
$query->addField('l', 'quantity');
$query->addExpression('COUNT(DISTINCT l.line_item_id)', 'item_count');

$line_item_types = commerce_product_line_item_types();
Expand Down Expand Up @@ -889,11 +890,11 @@ function commerce_pos_report_build_journal_role_table(array $filters = array())

switch ($row->type) {
case CommercePosService::TRANSACTION_TYPE_RETURN:
$return_count = $row->item_count;
$return_count = (int) $row->quantity;
break;

default:
$purchase_count = $row->item_count;
$purchase_count = (int) $row->quantity;
break;
}

Expand All @@ -903,7 +904,7 @@ function commerce_pos_report_build_journal_role_table(array $filters = array())
'attributes' => array(
'class' => array('commerce-pos-report-journal-role-order use-ajax'),
'data-order-id' => $row->order_id,
)
),
));

$table_row[] = format_date($row->completed, 'custom', 'g:i a');
Expand Down