Skip to content

Issue #2920915 by mbreden: Set the currency to the default commerce c… #81

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
MattBred wants to merge 1 commit into
base: 7.x-2.x
Choose a base branch
from
Open

Issue #2920915 by mbreden: Set the currency to the default commerce c… #81

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 3 additions & 7 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 @@ -395,8 +395,9 @@ function commerce_pos_report_get_totals($date_filter, $register_id) {
// Default to a single currency based off of the default commerce currency.
$currency_code = commerce_default_currency();

// Build a list of default totals.
foreach ($pos_methods as $pos_method) {
if (!empty($pos_method['status']) && intval($pos_method['status']) === COMMERCE_POS_PAYMENT_METHOD_STATUS_ENABLED) {
if (empty($pos_method['status']) || intval($pos_method['status']) === COMMERCE_POS_PAYMENT_METHOD_STATUS_ENABLED) {
$totals[$currency_code][$pos_method['id']] = array(
CommercePosService::TRANSACTION_TYPE_SALE => 0,
CommercePosService::TRANSACTION_TYPE_RETURN => 0,
Expand All @@ -411,13 +412,8 @@ function commerce_pos_report_get_totals($date_filter, $register_id) {
$statuses = commerce_payment_transaction_statuses();

foreach ($query->execute() as $row) {

if (!isset($totals[$row->commerce_order_total_currency_code][$row->payment_method])) {
$totals[$row->commerce_order_total_currency_code][$row->payment_method] = array(
CommercePosService::TRANSACTION_TYPE_SALE => 0,
CommercePosService::TRANSACTION_TYPE_RETURN => 0,
CommercePosService::TRANSACTION_TYPE_EXCHANGE => 0,
);
continue;
Copy link
Contributor Author

@MattBred MattBred Nov 3, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The reason we continue here is so we don't add extra currencies or payment methods that shouldn't be here. I just wonder if we should watchdog or set a message here somehow.

}

if ($row->status == COMMERCE_PAYMENT_STATUS_SUCCESS) {
Expand Down