diff -cr ./storminvoice/storminvoice.module ../storm_patched/storminvoice/storminvoice.module
*** ./storminvoice/storminvoice.module 2010-05-13 04:51:24.000000000 -0500
--- ../storm_patched/storminvoice/storminvoice.module 2010-09-02 12:45:45.000000000 -0500
***************
*** 1,973 ****
'. t("Provides invoice support for Storm") .'';
! break;
! }
! return $o;
! }
!
! function storminvoice_perm() {
! return array(
! 'Storm invoice: access',
! 'Storm invoice: add',
! 'Storm invoice: delete all',
! 'Storm invoice: delete own',
! 'Storm invoice: delete of user organization',
! 'Storm invoice: edit all',
! 'Storm invoice: edit own',
! 'Storm invoice: edit of user organization',
! 'Storm invoice: view all',
! 'Storm invoice: view own',
! 'Storm invoice: view of user organization',
! );
! }
!
! function storminvoice_init() {
! $settings = array(
! 'storm' => array(
! 'project_invoices_url' => url('storm/project_invoices_js/')
! ),
! );
! drupal_add_js($settings, 'setting');
! drupal_add_js(drupal_get_path('module', 'storminvoice') .'/storminvoice.js', 'module', 'header', FALSE);
! }
!
! function storminvoice_menu() {
! $items = array();
!
! $items['storm/project_invoices_js/%/%'] = array(
! 'title' => 'Tasks',
! 'page callback' => '_storminvoice_project_invoices_js',
! 'page arguments' => array(2, 3),
! 'access arguments' => array('Storm invoice: access'),
! 'file' => 'storminvoice.admin.inc',
! 'type' => MENU_CALLBACK,
! );
!
! $items['storm/invoices'] = array(
! 'title' => 'Invoices',
! 'description' => 'Storm invoices',
! 'page callback' => 'storminvoice_list',
! 'access arguments' => array('Storm invoice: access'),
! 'type' => MENU_NORMAL_ITEM,
! 'file' => 'storminvoice.admin.inc',
! );
!
! $items['storm/invoice/auto_add/new/%node'] = array(
! 'page callback' => 'storminvoice_auto_add',
! 'page arguments' => array(4),
! 'access arguments' => array('Storm invoice: add'),
! 'type' => MENU_CALLBACK,
! 'file' => 'storminvoice.auto_add.inc',
! );
!
! $items['storm/invoice/auto_add/existing/%'] = array(
! 'page callback' => 'drupal_get_form',
! 'page arguments' => array('storminvoice_auto_add_select'),
! 'access arguments' => array('Storm invoice: add'),
! 'type' => MENU_CALLBACK,
! 'file' => 'storminvoice.auto_add.inc',
! );
!
! $items['storm/invoice/report/%node/%/%'] = array(
! 'title' => 'Invoice',
! 'page arguments' => array(3, 4, 5),
! 'description' => 'Storm Invoice',
! 'page callback' => 'storminvoice_report',
! 'access arguments' => array('Storm invoice: access'),
! 'type' => MENU_CALLBACK,
! 'file' => 'storminvoice.admin.inc',
! );
!
! $items['storm/invoice/report/%node/email/%'] = array(
! 'title' => 'Send Invoice by Email',
! 'page arguments' => array(3, 5),
! 'description' => 'Storm Invoice',
! 'page callback' => 'storminvoice_send_page',
! 'access arguments' => array('Storm invoice: access'),
! 'type' => MENU_CALLBACK,
! 'file' => 'storminvoice.admin.inc',
! );
!
! $items['admin/settings/storm/invoice'] = array(
! 'title' => 'Storm Invoice',
! 'description' => 'Storm Invoice Administration Page',
! 'page callback' => 'drupal_get_form',
! 'page arguments' => array('storminvoice_admin_settings'),
! 'access arguments' => array('Storm: access administration pages'),
! 'type' => MENU_LOCAL_TASK,
! );
!
! return $items;
! }
!
! function storminvoice_theme() {
! return array(
! 'storminvoice_list' => array(
! 'file' => 'storminvoice.theme.inc',
! 'arguments' => array('header', 'invoices', 'itemsperpage', 'totals_topay', 'totals_paid', 'totals'),
! ),
! 'storminvoice_view' => array(
! 'file' => 'storminvoice.theme.inc',
! 'arguments' => array('node', 'teaser', 'page'),
! ),
! 'storminvoice_report' => array(
! 'file' => 'storminvoice.theme.inc',
! 'arguments' => array('node', 'report', 'language'),
! ),
! 'storminvoice_report_html' => array(
! 'file' => 'storminvoice.theme.inc',
! 'arguments' => array('node', 'language'),
! ),
! 'storminvoice_report_pdf' => array(
! 'file' => 'storminvoice.theme.inc',
! 'arguments' => array('node', 'language', array('output' => 'screen')),
! ),
! 'storminvoice_autoadd_links' => array(
! 'file' => 'storminvoice.theme.inc',
! 'arguments' => array('nid', 'billable', 'billed'),
! ),
! );
! }
!
! function storminvoice_node_info() {
! return array(
! 'storminvoice' => array(
! 'name' => t('Invoice'),
! 'module' => 'storminvoice',
! 'description' => t("An invoice for Storm."),
! 'title_label' => t("Description"),
! 'has_body' => false,
! ),
! );
! }
!
! function storminvoice_content_extra_fields($type_name) {
! if ($type_name == 'storminvoice') {
return array(
! 'group1' => array('label' => 'Number', 'weight' => -20),
! 'group2' => array('label' => 'Organization/Project/Reference Group', 'weight' => -19),
! 'group3' => array('label' => 'Date Group', 'weight' => -18),
! // Title (description) - weight -17
! 'group4' => array('label' => 'Invoice Items', 'weight' => -16),
! 'group5' => array('label' => 'Price Group', 'weight' => -15),
);
}
- }
-
- // ACCESS FUNCTIONS
- function storminvoice_access($op, $node, $account=NULL) {
- if (empty($account)) {
- global $user;
- $account = $user;
- }
-
- if (is_numeric($node)) {
- $node = node_load($node);
- }
- if ($op == 'create') {
- return user_access('Storm invoice: add');
- }
-
- if ($op == 'delete') {
- if (user_access('Storm invoice: delete all')) {
- return TRUE;
- }
- else if (user_access('Storm invoice: delete own') && ($account->uid == $node->uid)) {
- return TRUE;
- }
- else if (user_access('Storm invoice: delete of user organization') && ($account->stormorganization_nid == $node->organization_nid)) {
- return TRUE;
- }
- }
-
- if ($op == 'update') {
- if (user_access('Storm invoice: edit all')) {
- return TRUE;
- }
- else if (user_access('Storm invoice: edit own') && ($account->uid == $node->uid)) {
- return TRUE;
- }
- else if (user_access('Storm invoice: edit of user organization') && ($account->stormorganization_nid == $node->organization_nid)) {
- return TRUE;
- }
- }
-
- if ($op == 'view') {
- if (user_access('Storm invoice: view all')) {
- return TRUE;
- }
- else if (user_access('Storm invoice: view own') && ($account->uid == $node->uid)) {
- return TRUE;
- }
- else if (user_access('Storm invoice: view of user organization') && ($account->stormorganization_nid == $node->organization_nid)) {
- return TRUE;
- }
- }
- return FALSE;
- }
! function storminvoice_access_sql($sql, $where = array()) {
! if (user_access('Storm invoice: view all')) {
! $where[] = "'storm_access'='storm_access'";
! return storm_rewrite_sql($sql, $where);
}
! global $user;
! $cond = '';
! if (user_access('Storm invoice: view own')) {
! $cond .= 'n.uid='. $user->uid;
! }
! if (user_access('Storm invoice: view of user organization')) {
! if (!empty($cond)) $cond .= ' OR ';
! $cond .= 'sin.organization_nid='. $user->stormorganization_nid;
}
- if (empty($cond)) $cond = '0=1';
- $where[] = $cond;
-
- $where[] = "'storm_access'='storm_access'";
- return storm_rewrite_sql($sql, $where);
}
! function storminvoice_storm_rewrite_where_sql($query, $primary_table, $account) {
! static $conds = array();
! if ($conds[$primary_table][$account->uid]) {
! return $conds[$primary_table][$account->uid];
}
! if (preg_match("/'storm_access'='storm_access'/", $query)) {
! $cond = '';
! }
! else {
! if (user_access('Storm invoice: view all', $account)) {
! return '';
! }
!
! $cond = '';
! if (user_access('Storm invoice: view own', $account)) {
! $cond .= "${primary_table}.uid=". $account->uid;
! }
! if (user_access('Storm invoice: view of user organization', $account)) {
! if ($cond) {
! $cond .= ' OR ';
! }
! // If function is called without viewing an organization, this variable may not be set.
! // These lines check for that and set the organization node id to zero if not otherwise set.
! if (!isset($account->stormorganization_nid)) {
! $account->stormorganization_nid = 0;
! }
! $cond .= ' sin1.organization_nid='. $account->stormorganization_nid;
! }
! if ($cond) {
! $cond = " WHEN 'storminvoice' THEN (SELECT IF($cond,1,0) FROM {storminvoice} sin1 WHERE sin1.vid=${primary_table}.vid) ";
! }
! else {
! $cond = " WHEN 'storminvoice' THEN 0 ";
! }
}
! $conds[$primary_table][$account->uid] = $cond;
! return $cond;
! }
!
! // IMPLEMENT STORM HOOKS - ACCOUNT FOR CHANGES IN OTHER STORM NODES
! function storminvoice_stormorganization_change($organization_nid, $organization_title) {
! $s = "UPDATE {storminvoice} SET organization_title='%s' WHERE organization_nid=%d AND organization_title <> '%s'";
! db_query($s, $organization_title, $organization_nid, $organization_title);
! }
!
! function storminvoice_stormproject_change($project_nid, $project_title) {
! $s = "UPDATE {storminvoice} SET project_title='%s' WHERE project_nid=%d AND project_title <> '%s'";
! db_query($s, $project_title, $project_nid, $project_title);
! }
!
! function storminvoice_stormproject_change_hierarchy($project_nid, $organization_nid, $organization_title) {
! $s = "UPDATE {storminvoice} SET organization_nid=%d, organization_title='%s' WHERE project_nid=%d";
! db_query($s, $organization_nid, $organization_title, $project_nid);
! }
!
! // INVOICE CREATE/EDIT FORM
! function storminvoice_form(&$node) {
! $breadcrumb = array();
! $breadcrumb[] = l(t('Storm'), 'storm');
! $breadcrumb[] = l(t('Invoices'), 'storm/invoices');
! drupal_set_breadcrumb($breadcrumb);
!
! if (arg(1)=='add') {
! $node->requestdate = time();
! $node->duedate = $node->requestdate + (variable_get('storminvoice_payment_days', 30) * 86400);
! $node->number = storminvoice_get_invoice_number($node->requestdate);
!
! if (array_key_exists('organization_nid', $_GET) && !$node->organization_nid) {
! $node->organization_nid = $_GET['organization_nid'];
! }
! if (array_key_exists('project_nid', $_GET) && !$node->project_nid) {
! $node->project_nid = $_GET['project_nid'];
! $p = node_load($node->project_nid);
! $node->organization_nid = $p->organization_nid;
! if (!stormorganization_access('view', $node->organization_nid)) {
! drupal_set_message(t("You cannot add an invoice for this project, as you do not have access to view the organization's profile"));
! drupal_goto('node/'. $node->project_nid);
! }
! }
!
! if ($_SESSION['storminvoice_list_filter']['organization_nid'] && !$node->organization_nid) {
! $node->organization_nid = $_SESSION['storminvoice_list_filter']['organization_nid'];
! }
! if ($_SESSION['storminvoice_list_filter']['project_nid'] && !$node->project_nid) {
! $node->project_nid = $_SESSION['storminvoice_list_filter']['project_nid'];
! }
! $s_org = "SELECT n.nid, n.title FROM {stormorganization} so INNER JOIN {node} n
! ON so.nid=n.nid WHERE n.status=1 AND so.isactive=1 AND so.iscustomer=1 AND n.type='stormorganization' ORDER BY n.title";
! }
! else {
! $s_org = "SELECT n.nid, n.title FROM {stormorganization} so INNER JOIN {node} n
! ON so.nid=n.nid WHERE n.status=1 AND so.iscustomer=1 AND n.type='stormorganization' ORDER BY n.title";
! }
!
! $type = node_get_types('type', $node);
!
! $form['#attributes']['class'] = 'stormcomponent_node_form';
!
! $form['group1'] = array(
! '#type' => 'markup',
! '#theme' => 'storm_form_group',
! '#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'group1') : -20,
! );
!
! $form['group1']['number'] = array(
! '#type' => 'textfield',
! '#title' => t('Number'),
! '#required' => TRUE,
! '#size' => 10,
! '#default_value' => $node->number,
! );
!
! $form['title'] = array(
! '#type' => 'textfield',
! '#title' => check_plain($type->title_label),
! '#required' => TRUE,
! '#default_value' => $node->title,
! '#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'title') : -17,
! );
!
! $form['group2'] = array(
! '#type' => 'markup',
! '#theme' => 'storm_form_group',
! '#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'group2') : -19,
! );
!
! $s_org = stormorganization_access_sql($s_org);
! $s_org = db_rewrite_sql($s_org);
! $r = db_query($s_org);
! $organizations = array();
! while ($organization = db_fetch_object($r)) {
! $organizations[$organization->nid] = $organization->title;
! if (!$node->organization_nid) $node->organization_nid = $organization->nid;
! }
! $form['group2']['organization_nid'] = array(
! '#type' => 'select',
! '#title' => t('Organization'),
! '#default_value' => $node->organization_nid,
! '#options' => $organizations,
! '#required' => true,
! '#attributes' => array('onchange' => "stormproject_organization_projects(this, 'edit-project-nid', true, '-')"),
! );
!
! $s = "SELECT n.nid, n.title FROM {node} AS n INNER JOIN {stormproject} AS spr ON spr.vid=n.vid WHERE spr.organization_nid=%d AND n.status=1 AND n.type='stormproject' ORDER BY n.title";
! $s = stormproject_access_sql($s);
! $s = db_rewrite_sql($s);
! $r = db_query($s, $node->organization_nid);
! $projects = array();
! while ($project = db_fetch_object($r)) {
! $projects[$project->nid] = $project->title;
! }
! $projects = array(0 => '-') + $projects;
! $form['group2']['project_nid'] = array(
! '#type' => 'select',
! '#title' => t('Project'),
! '#default_value' => $node->project_nid,
! '#options' => $projects,
! '#process' => array('storm_dependent_select_process'),
! );
!
! $form['group2']['reference'] = array(
! '#type' => 'textfield',
! '#title' => t('Reference'),
! '#default_value' => $node->reference,
! '#size' => 40,
! );
!
! $form['group3'] = array(
! '#type' => 'markup',
! '#theme' => 'storm_form_group',
! '#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'group3') : -18,
! );
!
! $form['group3']['requestdate'] = array(
! '#type' => 'dateext',
! '#withnull' => 'true',
! '#title' => t('Request date'),
! '#default_value' => _storm_gmtimestamp_to_date($node->requestdate),
! );
!
! if (module_exists('date_api') && module_exists('date_popup')) {
! $form['group3']['requestdate'] = array(
! '#type' => 'date_popup',
! '#title' => t('Request date'),
! '#date_format' => 'Y-m-d',
! '#default_value' => date('Y-m-d',$node->requestdate),
! );
! }
!
! $form['group3']['duedate'] = array(
! '#type' => 'dateext',
! '#withnull' => 'true',
! '#title' => t('Due date'),
! '#default_value' => _storm_gmtimestamp_to_date($node->duedate),
! );
!
! if (module_exists('date_api') && module_exists('date_popup')) {
! $form['group3']['duedate'] = array(
! '#type' => 'date_popup',
! '#title' => t('Due date'),
! '#date_format' => 'Y-m-d',
! '#default_value' => date('Y-m-d',$node->duedate),
! );
! }
!
! $form['group3']['paymentdate'] = array(
! '#type' => 'dateext',
! '#withnull' => 'true',
! '#title' => t('Payment date'),
! '#default_value' => _storm_gmtimestamp_to_date($node->paymentdate),
! );
!
! if (module_exists('date_api') && module_exists('date_popup')) {
! $form['group3']['paymentdate'] = array(
! '#type' => 'date_popup',
! '#title' => t('Payment date'),
! '#date_format' => 'Y-m-d',
! '#default_value' => date('Y-m-d',$node->paymentdate),
! );
! }
!
! $form['group4'] = array(
! '#type' => 'markup',
! '#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'group4') : -16,
! );
!
! $count = count($node->items);
! for ($k = $count; $k <= $count + 2; $k++) {
! //$node->items[$k] = stdclass;
! $node->items[$k]->tax1app = variable_get('storm_tax1_app', 1);
! $node->items[$k]->tax1percent = variable_get('storm_tax1_percent', 20);
! $node->items[$k]->tax2app = variable_get('storm_tax2_app', 0);
! $node->items[$k]->tax2percent = variable_get('storm_tax2_percent', 20);
! $node->items[$k]->new_item = TRUE;
! }
!
! $i = 0;
! foreach ($node->items as $item) {
! $form['group4'][$i] = array(
! '#type' => 'fieldset',
! '#title' => isset($node->items[$i]->new_item) ? 'New Item' : 'Item '. ($i + 1),
! '#collapsible' => TRUE,
! '#collapsed' => isset($node->items[$i]->new_item) ? TRUE : FALSE,
! '#weight' => $i,
! );
!
! $form['group4'][$i]['first'] = array(
! '#type' => 'markup',
! '#theme' => 'storm_form_group',
! '#weight' => 1,
! );
!
! $form['group4'][$i]['first']['items_'. $i .'_description'] = array(
! '#type' => 'textfield',
! '#title' => 'Item description',
! '#default_value' => $node->items[$i]->description,
! '#size' => 80,
! );
!
! $form['group4'][$i]['first']['items_'. $i .'_weight'] = array(
! '#type' => 'hidden',
! '#default_value' => $node->items[$i]->weight,
);
!
! $form['group4'][$i]['first']['items_'. $i .'_amount'] = array(
! '#type' => 'textfield',
! '#withnull' => 'true',
! '#title' => t('Amount'),
! '#size' => 15,
! '#default_value' => $node->items[$i]->amount,
! );
!
! $form['group4'][$i]['tax1'] = array(
! '#type' => 'markup',
! '#theme' => 'storm_form_group',
! '#weight' => 2,
! );
!
! $form['group4'][$i]['tax1']['items_'. $i .'_tax1app'] = array(
! '#type' => 'select',
! '#title' => t('@tax1 Application', array('@tax1' => variable_get('storm_tax1_name', 'Tax 1'))),
! '#options' => array(
! 1 => t('Apply to item amount'),
! 0 => t('Do not apply tax'),
! ),
! '#default_value' => $node->items[$i]->tax1app,
);
!
! $form['group4'][$i]['tax1']['items_'. $i .'_tax1percent'] = array(
! '#type' => 'textfield',
! '#title' => t('@tax1 Percentage', array('@tax1' => variable_get('storm_tax1_name', 'Tax 1'))),
! '#default_value' => $node->items[$i]->tax1percent,
! '#size' => 20,
! );
!
! $form['group4'][$i]['tax2'] = array(
! '#type' => 'markup',
! '#theme' => 'storm_form_group',
! '#weight' => 3,
! );
!
! $form['group4'][$i]['tax2']['items_'. $i .'_tax2app'] = array(
! '#type' => 'select',
! '#title' => t('@tax2 Application', array('@tax2' => variable_get('storm_tax2_name', 'Tax 2'))),
! '#options' => array(
! 2 => t('Apply to total of item amount plus previous tax'),
! 1 => t('Apply to item amount'),
! 0 => t('Do not apply tax'),
! ),
! '#default_value' => $node->items[$i]->tax2app,
! );
!
! $form['group4'][$i]['tax2']['items_'. $i .'_tax2percent'] = array(
! '#type' => 'textfield',
! '#title' => t('@tax2 Percentage', array('@tax2' => variable_get('storm_tax2_name', 'Tax 2'))),
! '#default_value' => $node->items[$i]->tax2percent,
! '#size' => 20,
! );
!
! if (!variable_get('storm_tax_display', TRUE)) {
! $form['group4'][$i]['tax1']['#type'] = 'hidden';
! $form['group4'][$i]['tax2']['#type'] = 'hidden';
! }
! if (!variable_get('storm_tax2_display', TRUE)) {
! $form['group4'][$i]['tax2']['#type'] = 'hidden';
! }
!
! $form['group4'][$i]['items_'. $i .'_total'] = array(
! '#type' => 'hidden',
! '#default_value' => $node->items[$i]->total,
! );
!
! $i++;
! } // foreach
!
! $form['group5'] = array(
! '#type' => 'markup',
! '#theme' => 'storm_form_group',
! '#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'group5') : -15,
! );
!
! $form['group5']['amount'] = array(
! '#type' => 'textfield',
! '#title' => t('Amount'),
! /*'#attributes' => array('readonly' => 'readonly'),*/ //See #450778
! '#size' => 15,
! '#default_value' => $node->amount,
! );
!
! $form['group5']['tax1'] = array(
! '#type' => 'textfield',
! '#title' => variable_get('storm_tax1_name', 'Tax 1'),
! /*'#attributes' => array('readonly' => 'readonly'),*/ //See #450778
! '#size' => 15,
! '#default_value' => $node->tax1,
! );
!
! $form['group5']['tax2'] = array(
! '#type' => 'textfield',
! '#title' => variable_get('storm_tax2_name', 'Tax 2'),
! /*'#attributes' => array('readonly' => 'readonly'),*/ //See #450778
! '#size' => 15,
! '#default_value' => $node->tax2,
! );
!
! $form['group5']['total'] = array(
! '#type' => 'textfield',
! '#title' => t('Total'),
! /*'#attributes' => array('readonly' => 'readonly'),*/ //See #450778
! '#size' => 15,
! '#default_value' => $node->total,
! );
!
! if (!variable_get('storm_tax_display', TRUE)) {
! $form['group5']['tax1']['#type'] = 'hidden';
! $form['group5']['tax2']['#type'] = 'hidden';
! $form['group5']['total']['#type'] = 'hidden';
! }
!
! if (!variable_get('storm_tax2_display', TRUE)) {
! $form['group5']['tax2']['#type'] = 'hidden';
! }
!
! $form['group5']['totalcustomercurr'] = array(
! '#type' => 'textfield',
! '#title' => t('Total in customer currency'),
! '#size' => 15,
! '#default_value' => $node->totalcustomercurr,
! );
! return $form;
! }
!
! // INVOICE NODE MANIPULATION FUNCTIONS
! function storminvoice_insert($node) {
! _storminvoice_beforesave($node);
!
! db_query("INSERT INTO {storminvoice}
! (vid, nid, number, reference, organization_nid, organization_title,
! project_nid, project_title, amount, tax1, tax2,
! total, totalcustomercurr, requestdate, duedate, paymentdate,
! taxexempt, src_nid, src_vid) VALUES
! (%d, %d, '%s', '%s', %d, '%s',
! %d, '%s', %f, %f, %f,
! %f, %f, %d, %d, %d,
! %d, %d, %d)",
! $node->vid, $node->nid, $node->number, $node->reference, $node->organization_nid, $node->organization_title,
! $node->project_nid, $node->project_title, $node->amount, $node->tax1, $node->tax2,
! $node->total, $node->totalcustomercurr, $node->requestdate, $node->duedate, $node->paymentdate,
! $node->taxexempt, $node->src_nid, $node->src_vid);
!
! // Insert invoice items
! _storminvoice_insert_items($node);
!
! _storminvoice_aftersave($node);
! }
!
! function storminvoice_update($node) {
! _storminvoice_beforesave($node);
!
! if ($node->revision) {
! storminvoice_insert($node);
}
- else {
- db_query("UPDATE {storminvoice} SET
- number='%s', reference='%s', organization_nid=%d, organization_title='%s', project_nid=%d,
- project_title='%s', amount=%f, tax1=%f, tax2=%f, total=%f,
- totalcustomercurr=%f, requestdate=%d, duedate=%d, paymentdate=%d, taxexempt=%d WHERE vid = %d",
- $node->number, $node->reference, $node->organization_nid, $node->organization_title, $node->project_nid,
- $node->project_title, $node->amount, $node->tax1, $node->tax2, $node->total,
- $node->totalcustomercurr, $node->requestdate, $node->duedate, $node->paymentdate, $node->taxexempt, $node->vid);
-
- // Update invoice items
- db_query("DELETE from {storminvoice_items} WHERE invoice_vid = ". $node->vid);
- _storminvoice_insert_items($node);
-
- _storminvoice_aftersave($node);
- }
- }
! function _storminvoice_beforesave(&$node) {
! // Allow use of comma when inputting numerical values - str_replace with period decimal
! $node->amount = str_replace(',', '.', $node->amount);
! $node->tax1 = str_replace(',', '.', $node->tax1);
! $node->tax2 = str_replace(',', '.', $node->tax2);
! $node->total = str_replace(',', '.', $node->total);
! $node->totalcustomercurr = str_replace(',', '.', $node->totalcustomercurr);
!
! if (is_array($node->requestdate)) {
! $node->requestdate = _storm_date_to_gmtimestamp($node->requestdate);
}
- else {
- $node->requestdate = strtotime($node->requestdate);
- }
-
- if (is_array($node->duedate)) {
- $node->duedate = _storm_date_to_gmtimestamp($node->duedate);
- }
- else {
- $node->duedate = strtotime($node->duedate);
- }
-
- if (is_array($node->paymentdate)) {
- $node->paymentdate = _storm_date_to_gmtimestamp($node->paymentdate);
- }
- else {
- $node->paymentdate = strtotime($node->paymentdate);
- }
-
- $s = "SELECT n.title FROM {node} AS n
- INNER JOIN {stormorganization} AS o ON n.vid=o.vid
- WHERE type='stormorganization' AND n.nid=%d";
- $r = db_query($s, $node->organization_nid);
- $o = db_fetch_object($r);
- $node->organization_title = $o->title;
-
- $s = "SELECT n.title FROM {node} AS n
- INNER JOIN {stormproject} AS p ON n.vid=p.vid
- WHERE type='stormproject' AND n.nid=%d";
- $r = db_query($s, $node->project_nid);
- $p = db_fetch_object($r);
- $node->project_title = $p->title;
! if (!$node->totalcustomercurr) {
! $node->totalcustomercurr = $node->total;
! }
!
! // Parse invoice items
! //from linear to array/object combination
! $j = 0;
! $variable = 'items_'. $j . '_description';
! while (isset($node->$variable) && $node->$variable != '') {
! $node->items[$j]->description = $node->$variable;
! $variable = 'items_'. $j .'_amount';
! $node->items[$j]->amount = str_replace(',', '.', $node->$variable);
! $variable = 'items_'. $j .'_tax1app';
! $node->items[$j]->tax1app = $node->$variable;
! $variable = 'items_'. $j .'_tax1percent';
! $node->items[$j]->tax1percent = $node->$variable;
! $variable = 'items_'. $j .'_tax2app';
! $node->items[$j]->tax2app = $node->$variable;
! $variable = 'items_'. $j .'_tax2percent';
! $node->items[$j]->tax2percent = $node->$variable;
! $node->items[$j]->weight = $j;
!
! // Update taxes
! storm_taxation($node->items[$j]);
!
! $j++;
! $variable = 'items_'. $j .'_description';
}
- }
! function _storminvoice_insert_items($node) {
! $j = 0;
! while (is_object($node->items[$j])) {
! db_query("INSERT INTO {storminvoice_items}
! (invoice_nid, invoice_vid, amount, description,
! tax1app, tax1percent, tax1,
! tax2app, tax2percent, tax2,
! total, weight) VALUES
! (%d, %d, %f, '%s',
! %d, %f, %f,
! %d, %f, %f,
! %f, %d)",
! $node->nid, $node->vid, $node->items[$j]->amount, $node->items[$j]->description,
! $node->items[$j]->tax1app, $node->items[$j]->tax1percent, $node->items[$j]->tax1,
! $node->items[$j]->tax2app, $node->items[$j]->tax2percent, $node->items[$j]->tax2,
! $node->items[$j]->total, $node->items[$j]->weight);
! $j++;
! }
! }
! function _storminvoice_aftersave($node) {
! // Updates totals
! $s = "SELECT SUM(amount) tamount, SUM(tax1) ttax1, SUM(tax2) ttax2, SUM(total) ttotal
! FROM {storminvoice_items} WHERE invoice_vid=%d";
! $r = db_query($s, $node->vid);
! $t = db_fetch_object($r);
!
! $node->amount = $t->tamount;
! $node->tax1 = $t->ttax1;
! $node->tax2 = $t->ttax2;
! $node->total = $t->ttotal;
!
! db_query("UPDATE {storminvoice} SET
! amount=%f, tax1=%f, tax2=%f, total=%f, totalcustomercurr=%f WHERE vid = %d",
! $node->amount, $node->tax1, $node->tax2, $node->total, $node->totalcustomercurr, $node->vid);
! }
!
! function storminvoice_nodeapi(&$node, $op, $teaser, $page) {
! switch ($op) {
! case 'delete revision':
! // Notice that we're matching a single revision based on the node's vid.
! db_query('DELETE FROM {storminvoice} WHERE vid = %d', $node->vid);
! db_query('DELETE FROM {storminvoice_items} WHERE invoice_vid = %d', $node->vid);
! break;
}
- }
! function storminvoice_delete($node) {
! db_query('DELETE FROM {storminvoice} WHERE nid = %d', $node->nid);
! db_query('DELETE FROM {storminvoice_items} WHERE invoice_nid = %d', $node->nid);
! }
! function storminvoice_load($node) {
! $additions = db_fetch_object(db_query('SELECT * FROM {storminvoice} WHERE vid = %d', $node->vid));
!
! // Load invoice items
! $result = db_query('SELECT * FROM {storminvoice_items} WHERE invoice_vid = %d ORDER BY weight ASC', $node->vid);
! $additions->items = array();
! while ($item = db_fetch_object($result)) {
! $additions->items[] = $item;
}
! return $additions;
! }
! function storminvoice_view($node, $teaser = FALSE, $page = FALSE) {
! $breadcrumb = array();
! $breadcrumb[] = l(t('Storm'), 'storm');
! $breadcrumb[] = l(t('Invoices'), 'storm/invoices');
! drupal_set_breadcrumb($breadcrumb);
! return theme('storminvoice_view', $node, $teaser = FALSE, $page = FALSE);
! }
! // ADMIN SETTINGS
! function storminvoice_admin_settings() {
! $form = array();
!
! $form['storminvoice_payment_days'] = array(
! '#type' => 'textfield',
! '#title' => t('Number of days for invoice payment'),
! '#default_value' => variable_get('storminvoice_payment_days', 30),
! '#description' => t('Default number of days for invoice payment'),
! '#size' => 5,
! );
! $form['storminvoice_payment_modes'] = array(
! '#type' => 'textarea',
! '#title' => t('Modes for invoice payment'),
! '#default_value' => variable_get('storminvoice_payment_modes', ''),
! '#description' => t('Modes for invoice payment'),
! );
!
! $form['storminvoice_cover_note_subject'] = array(
! '#type' => 'textfield',
! '#title' => t('Cover note subject'),
! '#default_value' => variable_get('storminvoice_cover_note_subject', t('Invoice from !site', array('!site' => variable_get('site_name', 'STORM')))),
! '#description' => t('Default subject for cover note'),
! '#size' => 50,
! );
!
! $form['storminvoice_cover_note'] = array(
! '#type' => 'textarea',
! '#title' => t('Cover note for invoice'),
! '#default_value' => variable_get('storminvoice_cover_note', 'Hope this comes easy to you.'),
! '#description' => t('Default cover note for pdf invoice sent by email'),
! );
!
! $form['storminvoice_payment_terms'] = array(
! '#type' => 'textfield',
! '#title' => t('Payment terms'),
! '#default_value' => variable_get('storminvoice_payment_terms', t('Due on receipt')),
! '#description' => t('Payment terms'),
! '#size' => 50,
! );
!
! $form['storminvoice_tcpdf_location'] = array(
! '#type' => 'textfield',
! '#title' => t('Location of tcpdf library'),
! '#default_value' => variable_get('storminvoice_tcpdf_location', t('sites/all/libraries/tcpdf')),
! '#description' => t('The directory that contains the TCPDF library (sites/all/libraries/tcpdf is recommended).'),
! '#size' => 50,
! );
!
! return system_settings_form($form);
! }
!
! // VIEWS HOOK
! function storminvoice_views_api() {
! return array(
! 'api' => 2,
! 'path' => drupal_get_path('module', 'storminvoice'),
! );
! }
!
! // Helper function to return items for a particular invoice. Called from within the theme functions
! function storminvoice_getitems($invoice_vid) {
! $s = "SELECT sit.* FROM {storminvoice_items} AS sit WHERE sit.invoice_vid = %d";
! $r = db_query($s, $invoice_vid);
!
! $items = array();
! while ($i = db_fetch_object($r)) {
! $items[] = $i;
! }
! return $items;
! }
!
! /**
! * function to return the next invoice number.
! * It will look for the highest invoice number within the current year and add one.
! *
! * @return
! * Returns a text value of the calculated invoice number.
! */
! function storminvoice_get_invoice_number($requestdate) {
! $s = "SELECT MAX(CAST(SUBSTRING_INDEX(sin.number, '/', 1) AS SIGNED)) FROM {node} n INNER JOIN {storminvoice} sin ON n.nid=sin.nid
! WHERE n.type='storminvoice' AND YEAR(FROM_UNIXTIME(sin.requestdate))=YEAR(FROM_UNIXTIME(%d))";
! $date = getdate($requestdate);
! $new_invoice_number = (db_result(db_query($s, $requestdate)) + 1) .'/'. $date['year'];
! return $new_invoice_number;
! }
!
! function storminvoice_get_item_desc($rate_array, $node) {
! $description = date('d M y', $node->trackingdate) . ': ';
!
! switch ($rate_array['pricemode_used']) {
! case 'hourly':
! $description .= t('@dur hours work at @rate per hour on @desc', array('@dur' => $node->billing_duration, '@rate' => $rate_array['rate_to_use'], '@desc' => $node->title));
! break;
! case 'daily':
! $description .= t('@dur hours work at @rate per day on @desc', array('@dur' => $node->billing_duration, '@rate' => $rate_array['rate_to_use'], '@desc' => $node->title));
! break;
! case 'daily':
! $description .= t('@dur hours work at @rate per day on @desc', array('@dur' => $node->billing_duration, '@rate' => $rate_array['rate_to_use'], '@desc' => $node->title));
! break;
! case 'fixed':
! $description .= t('@dur hours unbilled work on @desc', array('@dur' => $node->billing_duration, '@desc' => $node->title));
! break;
! case 'fixed_timetracking':
! $description .= t('work billed for @desc', array('@desc' => $node->title));
! break;
}
!
! return $description;
!
! }
!
! function storminvoice_get_item_amount($rate_array, $node) {
! switch ($rate_array['pricemode_used']) {
! case 'hourly':
! $amount = $node->billing_duration * $rate_array['rate_to_use'];
! break;
! case 'fixed':
! $amount = $rate_array['rate_to_use'];
! break;
! case 'fixed_timetracking':
! $amount = $rate_array['rate_to_use'];
! break;
! }
!
! return $amount;
! }
!
--- 1,162 ----
t('Storm Invoice Functionality'),
! 'description' => t('Test the functionality of the Storm Invoice module'),
! 'group' => 'Storm',
);
}
! public function setUp() {
! parent::setUp('storm', 'stormattribute', 'stormorganization', 'stormproject', 'storminvoice');
}
! public function testStorminvoiceCreate() {
! // Create and login user
! $user = $this->drupalCreateUser(array('Storm organization: add', 'Storm organization: view all', 'Storm invoice: add', 'Storm invoice: view all'));
! $this->drupalLogin($user);
!
! // Create organization and invoice
! $org = array(
! 'title' => $this->randomName(32),
! 'body' => $this->randomName(64),
! );
! $inv = array(
! 'title' => $this->randomName(32),
! 'organization_nid' => '1',
! 'items_0_description' => $this->randomName(32),
! 'items_0_amount' => '.28',
! 'items_0_tax1app' => '1',
! 'items_0_tax1percent' => '5',
! 'items_0_tax2app' => '2',
! 'items_0_tax2percent' => '7.5',
! );
! $this->drupalPost('node/add/stormorganization', $org, t('Save'));
! $this->drupalPost('node/add/storminvoice', $inv, t('Save'));
! $this->assertText(t('Invoice @title has been created.', array('@title' => $inv['title'])));;
}
}
! class StorminvoiceRoundingTestCase extends DrupalWebTestCase {
! public static function getInfo() {
! return array(
! 'name' => t('Storm Invoice Rounding Functionality'),
! 'description' => t('Test the rounding functionality of the Storm
! Invoice module'),
! 'group' => 'Storm',
! );
}
! public function setUp() {
! parent::setUp('storm', 'stormattribute', 'stormorganization', 'stormproject', 'storminvoice');
! $privileged_user = $this->drupalCreateUser(array('Storm organization: add', 'Storm invoice: add', 'Storm invoice: edit all', 'Storm invoice: view all', 'Storm project: add', 'Storm organization: view all', 'Storm: access administration pages', 'Storm: access dashboard'));
! $this->drupalLogin($privileged_user);
}
! public function _testStorminvoiceCreate($subtotal, $tax1, $tax2, $total, $message) {
! $org = array(
! 'title' => $this->randomName(32),
! 'body' => $this->randomName(64),
);
! $inv = array(
! 'title' => $this->randomName(32),
! 'organization_nid' => '1',
! 'items_0_description' => $this->randomName(32),
! 'items_0_amount' => '.28',
! 'items_0_tax1app' => '1',
! 'items_0_tax1percent' => '5',
! 'items_0_tax2app' => '2',
! 'items_0_tax2percent' => '7.5',
);
! $this->drupalPost('node/add/stormorganization', $org, t('Save'));
! $this->drupalPost('node/add/storminvoice', $inv, t('Save'));
! $this->assertRaw('Amount:
' . $subtotal . '
Amount:
' . $subtotal . '