Skip to content

Commit

Permalink
Bugs Fixed
Browse files Browse the repository at this point in the history
- Orders Check Out
- Email Template
- User Login
- User Profile
- Products Search
  • Loading branch information
gocanto committed Oct 27, 2015
1 parent 334fb88 commit 7da9b6d
Show file tree
Hide file tree
Showing 8,017 changed files with 1,033,202 additions and 203 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
8 changes: 4 additions & 4 deletions app/Helpers/Menu.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public static function dashboard($returnArray=false)
->whereNotIn('status', ['cancelled', 'closed'])
->get()
->count();

$menu=array_merge($menu, [
['route'=> '/products/myProducts', 'text'=> trans('user.your_products'), 'icon'=>'glyphicon glyphicon-briefcase', 'cont'=> $productsLowStock],
['route'=> '/orders/usersOrders', 'text'=> trans('user.your_sales'), 'icon'=>'glyphicon glyphicon-piggy-bank', 'cont' => $salesOpen ],
Expand Down Expand Up @@ -115,16 +115,16 @@ public static function backend($returnArray=false)
public static function help($returnArray=false)
{
//Menu para empresas

$menu = [
['route' =>'#', 'text'=> trans('globals.faq'), ],
// ['route' =>'#', 'text'=> trans('globals.faq'), ],
['route' =>'/about','text'=> trans('company.about_us'), ],
['route' =>'/refunds','text'=> trans('company.refund_policy'), ],
['route' =>'/privacy', 'text'=> trans('company.privacy_policy'), ],
['route' =>'/terms', 'text'=> trans('company.terms_of_service'), 'divider'=>1 ],
['route' =>'/contact', 'text'=> trans('about.contact_us'), ],
];


return $returnArray ? $menu : json_encode($menu);
}
Expand Down
26 changes: 13 additions & 13 deletions app/Helpers/Utility.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public static function showPrice($arg)
} else {
$options['amount']=$arg;
}

switch (config('app.payment_method')) {

case 'Points':
Expand All @@ -51,8 +51,8 @@ public static function showPrice($arg)
}

return $points;


default:

setlocale(LC_MONETARY, config('app.lc_monetary'));
Expand Down Expand Up @@ -150,28 +150,28 @@ public static function totalByStatusOrder($orders)

$orders->each(function ($order, $key) use (&$summary) {
$total = self::totalOrder($order->details);

switch ($order->status) {
case 'open':
$summary['open']['qty']++;
$summary['open']['total'] += $total['total'];
break;

case 'pending':
$summary['pending']['qty']++;
$summary['pending']['total'] += $total['total'];
break;

case 'sent':
$summary['sent']['qty']++;
$summary['sent']['total'] += $total['total'];
break;

case 'closed':
$summary['closed']['qty']++;
$summary['closed']['total'] += $total['total'];
break;

case 'cancelled':
$summary['cancelled']['qty']++;
$summary['cancelled']['total'] += $total['total'];
Expand Down Expand Up @@ -295,7 +295,7 @@ public static function printBarCode($product = null, $type = 'EAN8')
/**
* requestToArrayUnique
* this method is able to return a unique multidimensional array
* @param [array] $request is the evaluated array
* @param [array] $request is the evaluated array
* @return [array] unique index array
*/
public static function requestToArrayUnique($request)
Expand All @@ -308,7 +308,7 @@ public static function requestToArrayUnique($request)
if ($key == 'category') {
$aux = explode('|', $value);
$refine[$key] = $aux[0];
$refine['category_name'] = $aux[1];
$refine['category_name'] = isset($aux[1]) ? $aux[1] : '';
}else {
$refine[$key] = $value;
}
Expand All @@ -333,12 +333,12 @@ public static function getUrlQueryString($refine, $key, $value)
{
if ($_key != 'category_name') { //validating no category name in the url
if ($_key == $key) {
$query .= $_key.'='.urlencode($value).'&';
$query .= $_key.'='.urlencode($value).'&';
$passed = true;
}else {
}else {
//if there is a category the category value is built
$_value = $_key == 'category' ? $_value.'|'.$refine['category_name'] : $_value;
$query .= $_key.'='.urlencode($_value).'&';
$query .= $_key.'='.urlencode($_value).'&';
}
}
}
Expand Down
Loading

0 comments on commit 7da9b6d

Please sign in to comment.