diff --git a/mp_marketplace/mp_marketplace.module b/mp_marketplace/mp_marketplace.module
index 6cccbfc..35dd154 100644
--- a/mp_marketplace/mp_marketplace.module
+++ b/mp_marketplace/mp_marketplace.module
@@ -19,7 +19,7 @@ function mp_marketplace_menu() {
'page callback' => 'mp_marketplace_selling_overview',
'page arguments' => array(1),
'access callback' => 'mp_marketplace_can_view_seller',
- //'access arguments' => array(1),
+ 'access arguments' => array(1),
'type' => MENU_LOCAL_TASK,
'file' => 'mp_marketplace.admin.inc',
);
@@ -29,7 +29,7 @@ function mp_marketplace_menu() {
'type' => MENU_DEFAULT_LOCAL_TASK,
);
- $items['admin/store/settings/seller'] = array(
+ $items['admin/store/settings/seller'] = array(
'title' => 'Seller settings',
'access arguments' => array('administer sellers'),
'description' => 'Configure the marketplace seller settings.',
@@ -78,7 +78,7 @@ function mp_marketplace_user($op, &$edit, &$account, $category = NULL) {
*/
function mp_marketplace_form_alter(&$form, $form_state, $form_id) {
switch ($form_id) {
- // Add a "to do" checklist to UC Marketplace's primary setting's page
+ // Add a "to do" checklist to UC Marketplace's primary setting's page
case 'mp_marketplace_settings_seller_form':
$form['mp_marketplace'] = array(
'#type' => 'markup',
@@ -91,7 +91,7 @@ function mp_marketplace_form_alter(&$form, $form_state, $form_id) {
}
function mp_marketplace_admin() {
-
+
$results = module_invoke_all('marketplace_status');
foreach ($results as $message) {
@@ -126,12 +126,12 @@ function mp_marketplace_admin() {
*/
function mp_marketplace_marketplace_status() {
$checklist = array();
-
+
// CCK filefield
if (module_exists('mp_file')) {
$field_name = 'field_'. variable_get('mp_file_field_name', 'download');
$field = content_fields($field_name);
-
+
if (empty($field) || $field['type'] != 'filefield') {
$status = 'warning';
$description = t($field_name . ' is not a valid product filefield.');
@@ -143,11 +143,11 @@ function mp_marketplace_marketplace_status() {
$checklist[] = array('status' => $status, 'title' => t('Downloads'), 'desc' => $description);
}
-
+
// Packing slip
if (module_exists('mp_quote')) {
$packingslip = base_path() . drupal_get_path('module', 'uc_order') .'/templates/packingslip.itpl.php';
-
+
if (!file_exists($_SERVER{'DOCUMENT_ROOT'} . $packingslip)) {
$status = 'warning';
$description = t('packingslip.itpl.php does not exist');
@@ -156,10 +156,10 @@ function mp_marketplace_marketplace_status() {
$status = 'ok';
$description = t('packingslip.itpl.php exists');
}
-
+
$checklist[] = array('status' => $status, 'title' => t('packingslip'), 'desc' => $description);
}
-
+
// Paypal API
if (module_exists('uc_paypal')) {
$paypal_api = variable_get('uc_paypal_api_username', '');
@@ -171,14 +171,14 @@ function mp_marketplace_marketplace_status() {
$status = 'warning';
$description = t('Paypal API credentials have not been configured.');
}
-
+
$checklist[] = array('status' => $status, 'title' => t('Paypal WPP'), 'desc' => $description);
}
-
+
// Shipping patches applied
// $filename = base_path() . drupal_get_path('module', 'uc_shipping') .'/uc_shipping.module';
// $filecontents = file_get_contents($_SERVER{'DOCUMENT_ROOT'} . $filename);
-//
+//
// if (preg_match("/module_invoke_all\('package',/i", $filecontents)) {
// $status = 'ok';
// $description = t('Shipping patches have been applied.');
@@ -187,21 +187,21 @@ function mp_marketplace_marketplace_status() {
// $status = 'warning';
// $description = t('Shipping patches have not been applied.');
// }
-//
+//
// $checklist[] = array('status' => $status, 'title' => t('Shipping Patch'), 'desc' => $description);
return $checklist;
}
-function mp_marketplace_can_view_seller() {
+function mp_marketplace_can_view_seller($menu_user) {
global $user;
-
+
// mp_reports and this function probably need restructuring
// For now let's add conditionals for clarity
if (user_access('administer sellers')) {
return TRUE;
}
- elseif (user_access('act as seller') && ($user->uid == arg(1))) {
+ elseif (user_access('act as seller') && ($user->uid == $menu_user->uid)) {
switch (arg(3)) {
case '':
return TRUE;
diff --git a/mp_products/mp_products.module b/mp_products/mp_products.module
index bdf872a..0f6405a 100644
--- a/mp_products/mp_products.module
+++ b/mp_products/mp_products.module
@@ -5,7 +5,7 @@
* Handles all things concerning Ubercart marketplace products.
*
* The Ubercart marketplace product enhancement allows sellers to view their
- * items and edit them. This module also includes concept code for manipulating
+ * items and edit them. This module also includes concept code for manipulating
* the product edit page to suit the sellers' needs.
*
*/
@@ -27,7 +27,7 @@ function mp_products_perm() {
function mp_products_help($path, $arg) {
switch ($path) {
case 'user/%/selling/view':
- return
+ return
'' . t("Products") . '
' .
''. t("The following is a list of all the products you have submitted. You can edit a product by clicking the edit icon next to its name.") .'
';
}
@@ -46,7 +46,7 @@ function mp_products_menu() {
'page callback' => 'mp_products_selling',
'page arguments' => array(1),
'access callback' => 'mp_marketplace_can_view_seller',
- //'access arguments' => array(1),
+ 'access arguments' => array(1),
'type' => MENU_LOCAL_TASK,
'file' => 'mp_products.admin.inc',
);
@@ -107,18 +107,18 @@ function mp_products_form_alter(&$form, $form_state, $form_id) {
$form['base']['ordering']['#access'] = FALSE;
$form['shipping']['#access'] = FALSE;
}
-
+
// The default breadcrumb points to inaccessible admin pages unless we change it
$breadcrumb[] = l('Home', NULL);
drupal_set_breadcrumb($breadcrumb);
}
}
-
+
// Admin attribute interface
if ($form_id == 'uc_attribute_option_form') {
$form['adjustments']['cost']['#title'] = t('Cost or Seller Commission');
}
-
+
// Alter the attributes form for validation & submission (for commission, etc.)
$product_types = variable_get('mp_product_tools_enabled_classes', array());
if ($form_id == 'uc_object_options_form' && in_array($form['type']['#value'], $product_types)) {
@@ -126,21 +126,21 @@ function mp_products_form_alter(&$form, $form_state, $form_id) {
if ($form['attributes']['1']['options'][$key]['cost']) {
// Make seller commission read only?
$form['attributes']['1']['options'][$key]['cost']['#attributes'] = array('readonly' => 'readonly');
-
+
// js magic on the cost field
if (variable_get('mp_products_insert_js', FALSE)) {
$commission_rate = mp_products_get_commission_rate($node->type);
$price_id = '#edit-attributes-1-options-' . $key . '-price';
$cost_id = '#edit-attributes-1-options-' . $key . '-cost';
- drupal_add_js("$(document).ready(function(){ " .
- "$('". $price_id ."').blur(function(){ " .
- "$('" . $cost_id . "').val(Math.floor($('". $price_id ."').val() * ". drupal_to_js($commission_rate)* 100 .")/100);" .
- "});" .
+ drupal_add_js("$(document).ready(function(){ " .
+ "$('". $price_id ."').blur(function(){ " .
+ "$('" . $cost_id . "').val(Math.floor($('". $price_id ."').val() * ". drupal_to_js($commission_rate)* 100 .")/100);" .
+ "});" .
"});", 'inline');
}
}
}
-
+
// Validation magic
$form['#validate'][] = 'mp_products_object_options_form_validate';
}
@@ -168,7 +168,7 @@ function mp_products_preprocess_page(&$vars) {
if (arg(0) == 'node' && arg(3) == 'options') {
$vars['content'] = preg_replace("/CostSeller Commission<", $vars['content']);
}
-
+
// Admin table header change
if (arg(0) == 'admin' && arg(1) == 'store' && arg(2) == 'attributes' && arg(4) == 'options') {
$vars['content'] = preg_replace("/ | Default costDefault cost or commission<", $vars['content']);
diff --git a/mp_quote/mp_quote.module b/mp_quote/mp_quote.module
index a2c5a20..41c7e6b 100644
--- a/mp_quote/mp_quote.module
+++ b/mp_quote/mp_quote.module
@@ -23,7 +23,7 @@ function mp_quote_menu() {
'title' => 'Settings',
'description' => 'Configure your shipping settings.',
'access callback' => 'mp_marketplace_can_view_seller',
- //'access arguments' => array(1),
+ 'access arguments' => array(1),
'page callback' => 'drupal_get_form',
'page arguments' => array('mp_quote_seller_settings', 1),
'weight' => 20,
@@ -42,13 +42,13 @@ function mp_quote_menu() {
function mp_quote_admin_methods() {
$form = array();
-
+
$form['mp_quote_flatrate_id'] = array('#type' => 'textfield',
'#title' => t('Flat Rate ID'),
'#description' => t('The numeric id of the existing flat rate method that is to be used if sellers choose flat rate as a product\'s shipping method. This can be determined by inspecting the last argument of the url to edit the flat rate method (admin/store/settings/quotes/methods/flatrate). This flat rate method should NOT be enabled as a quote method, as it will be invoked by mp_quote and should not be invoked separately or in duplication.'),
'#default_value' => variable_get('mp_quote_flatrate_id', 1),
);
-
+
return system_settings_form($form);
}
@@ -135,9 +135,9 @@ function mp_quote_node_submit($form, &$form_state) {
function mp_quote_seller_settings($form_state, $account) {
$address = db_fetch_object(db_query("SELECT * FROM {mp_quote_sellers} WHERE uid = %d", $account->uid));
-
+
$form = array();
-
+
$form['default_address'] = array(
'#type' => 'fieldset',
'#title' => t('Default shipping address'),
@@ -160,7 +160,7 @@ function mp_quote_seller_settings($form_state, $account) {
'#default_value' => FALSE,
);
}
-
+
$form['markup_amount'] = array(
'#type' => 'textfield',
'#default_value' => $address->markup_rate,
@@ -168,12 +168,12 @@ function mp_quote_seller_settings($form_state, $account) {
'#size' => 10,
'#description' => t('Enter a numeric value to be added to shipping quotes retrieved in real-time (i.e. USPS live rates). The purpose of this markup is to cover packaging or handling costs.'),
);
-
+
$form['submit'] = array(
'#type' => 'submit',
'#value' => t('Save'),
);
-
+
return $form;
}
@@ -186,7 +186,7 @@ function mp_quote_seller_settings_validate($form, &$form_state) {
function mp_quote_seller_settings_submit($form, &$form_state) {
$account = $form['#parameters'][2];
-
+
db_query("DELETE FROM {mp_quote_sellers} WHERE uid = %d", $account->uid);
db_query("INSERT INTO {mp_quote_sellers} (uid, first_name, last_name, company, street1, street2, city, zone, postal_code, country, markup_rate) VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', %d, '%s', %d, %f)",
$account->uid, $form_state['values']['first_name'], $form_state['values']['last_name'], $form_state['values']['company'], $form_state['values']['street1'], $form_state['values']['street2'], $form_state['values']['city'], $form_state['values']['zone'], $form_state['values']['postal_code'], $form_state['values']['country'], $form_state['values']['markup_amount']
@@ -195,7 +195,7 @@ function mp_quote_seller_settings_submit($form, &$form_state) {
if (user_access('administer sellers') && $form_state['values']['update_products']) {
db_query("UPDATE {uc_quote_product_locations} SET first_name = '%s', last_name = '%s', company = '%s', street1 = '%s', street2 = '%s', city = '%s', zone = %d, postal_code = '%s', country = %d WHERE nid IN (SELECT nid FROM {node} WHERE uid = %d)", $form_state['values']['first_name'], $form_state['values']['last_name'], $form_state['values']['company'], $form_state['values']['street1'], $form_state['values']['street2'], $form_state['values']['city'], $form_state['values']['zone'], $form_state['values']['postal_code'], $form_state['values']['country'], $account->uid);
}
-
+
drupal_set_message(t('Settings saved'));
}
@@ -207,7 +207,7 @@ function mp_quote_seller_settings_submit($form, &$form_state) {
function mp_quote_ca_predicate() {
$enabled = variable_get('uc_quote_enabled', array());
$predicates = array();
-
+
$predicates['mp_quote_get_quote'] = array(
'#title' => t('Shipping quote via mp_quote'),
'#trigger' => 'get_quote_from_mp_quote',
@@ -274,9 +274,9 @@ function mp_quote_quote($products, $details) {
$quote_method = db_result(db_query("SELECT quote_method FROM {mp_quote_products} WHERE nid = %d", $product->nid));
$pbv[$product->uid][$quote_method][] = $product;
}
-
+
// drupal_set_message(''. print_r($pbv, TRUE) .' ');
-
+
$sqr = 0;
// sqr = shipping quote rate
// vp = vendor's products
@@ -284,7 +284,7 @@ function mp_quote_quote($products, $details) {
foreach ($pbv as $uid => $vp) {
$quotes = array();
// retrieve a shipping quote for this vendor's products based on methods selected
-
+
// ===FLAT RATE QUOTE METHOD===
if (isset($pbv[$uid][0])) {
$flatrate_name = 'flatrate_'. variable_get('mp_quote_flatrate_id', 1);
@@ -295,7 +295,7 @@ function mp_quote_quote($products, $details) {
$sqr += $quote[0]['rate'];
$_SESSION['mp_quote_rate'][$uid] += $quote[0]['rate'];
}
-
+
// ===USPS QUOTE METHOD===
if (isset($pbv[$uid][1])) {
$quote = uc_usps_quote($pbv[$uid][1], $details, array('id' => 'usps'));
@@ -306,23 +306,23 @@ function mp_quote_quote($products, $details) {
$sqr += $quote[1]['rate'] + $markup_rate; // 1 = USPS Priority Mail Service Code (Ubercart)
$_SESSION['mp_quote_rate'][$uid] += $quote[1]['rate'] + $markup_rate;
}
-
+
}
-
+
$quotes['Shipping'] = array('rate' => $sqr, 'format' => uc_currency_format($sqr), 'option_label' => t('Shipping'));
-
+
return $quotes;
}
/**
* Implementation of Ubercart's hook_order().
- *
+ *
* Saves the shipping rates per seller to db
*/
function mp_quote_order($op, &$order, $arg2) {
if ($op == 'submit') {
foreach ($_SESSION['mp_quote_rate'] as $uid => $rate) {
- db_query("INSERT INTO {mp_quote_shipping_rates} (uid, order_id, rate) VALUES (%d, %d, %f)", $uid, $order->order_id, $rate);
+ db_query("INSERT INTO {mp_quote_shipping_rates} (uid, order_id, rate) VALUES (%d, %d, %f)", $uid, $order->order_id, $rate);
}
unset($_SESSION['mp_quote_rate']);
}
|