Skip to content

Adding updates for void payments #55

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
rigids wants to merge 6 commits into
base: 7.x-2.x
Choose a base branch
from
Open

Adding updates for void payments #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
481e011
Adding updates for void payments
rigids May 26, 2017
e25e5e7
Issue #2858914 by rigids, smccabe, mattferguson, wildkatana: KPI Repo…
May 30, 2017
5772039
Updated new patch
rigids May 31, 2017
7507ee4
Clearing phpcbf errors
rigids May 31, 2017
6623524
Merge branch '7.x-2.x' into void-payments
rigids Jun 1, 2017
df4c3fb
Changing VOID styling and removing PHPCBF errors
rigids Jun 1, 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
9 changes: 8 additions & 1 deletion modules/report/commerce_pos_report.module
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
*/

define('COMMERCE_POS_REPORT_JOURNAL_ROLE_DEFAULT_ITEMS_PER_PAGE', 25);
define('COMMERCE_POS_REPORT_SALES_REPORT_DEFAULT_ITEMS_PER_PAGE', 25);

/**
* Implements hook_menu().
Expand All @@ -17,7 +18,6 @@ function commerce_pos_report_menu() {
'file' => 'includes/commerce_pos_report.pages.inc',
'access arguments' => array('view commerce pos reports'),
);

$items['admin/commerce/pos/reports/end-of-day'] = array(
'title' => 'End of Day Report',
'page callback' => 'drupal_get_form',
Expand All @@ -32,6 +32,13 @@ function commerce_pos_report_menu() {
'file' => 'includes/commerce_pos_report.pages.inc',
'access arguments' => array('view commerce pos reports'),
);
$items['admin/commerce/pos/reports/sales-report'] = array(
'title' => 'Sales Report',
'page callback' => 'drupal_get_form',
'page arguments' => array('commerce_pos_report_sales_report'),
'file' => 'includes/commerce_pos_report.pages.inc',
'access arguments' => array('view commerce pos reports'),
);
$items['admin/commerce/pos/end-of-day/print/%'] = array(
'title' => 'Print Transaction Receipt',
'page callback' => 'commerce_pos_report_receipt_print',
Expand Down
75 changes: 75 additions & 0 deletions modules/report/css/commerce_pos_report.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,22 @@ a:hover .commerce-pos-report-ico-journal-role {
vertical-align: middle;
}

.commerce-pos-report-ico-sales-report{
position: relative;
bottom: 2px;
background: url(../../../images/sprite_icons.png) -56px 0;
width: 18px;
height: 20px;
display: inline-block;
vertical-align: middle;
margin-right: 10px;

}
a.active .commerce-pos-report-ico-sales-report,
a:hover .commerce-pos-report-ico-sales-report {
background-position: -80px 0;
}

/* -- Report Filters -- */

#commerce-pos-report-journal-role-options-container {
Expand Down Expand Up @@ -556,3 +572,62 @@ a:hover .commerce-pos-report-ico-journal-role {
border-bottom: 2px solid #ddd;
padding-top: 5px;
}
.element-form-report{
padding-bottom: 20px;
}

/*Table theme for reports*/
.report-table-theme table.sticky-enabled.tableheader-processed.sticky-table thead th {
border-bottom: 2px solid #ddd;
font-size: 16px;
text-transform: none;
text-align: center;
background: #fff;
}
.report-table-theme table.sticky-enabled thead th:first-of-type{
text-align: left;
}
.report-table-theme table.sticky-enabled thead th.active{
background: #fff;
}
.report-table-theme table.sticky-enabled thead th a {
color: #000;
}
.report-table-theme table.sticky-enabled thead th a:hover{
text-decoration: none;
color: #337ab7;
}
.report-table-theme table.sticky-enabled thead th img {
position: relative;
bottom: 1px;
left: 6px;
top: 0;
right: 0;
}
.report-table-theme table.tableheader-processed.sticky-table tbody tr.even, .report-table-theme table.tableheader-processed.sticky-table tbody tr.odd{
background-color: #f5f5f5;
color: #000;
border-top:1px solid #e2e2e2;
font-size: 14px;
}
.report-table-theme table.sticky-enabled.tableheader-processed.sticky-table tbody tr:last-of-type {
border-top: 2px solid #ddd;
font-weight: bold;
}
.report-table-theme table.tableheader-processed.sticky-table tbody tr:hover{
background: #e5ecf2;
}
.report-table-theme table.sticky-enabled tbody td {
text-align: center;
border: 0;
}
.report-table-theme table.sticky-enabled tbody td:first-of-type{
text-align: left;
}
.report-table-theme table.sticky-enabled tbody td.active {
background: transparent;
border-top: 1px solid #e2e2e2;
}
.report-table-theme table.sticky-enabled tbody td.empty{
text-align: center;
}
Loading