← All changes | app/Helpers/AdminHelper.php +35 -33 1.3.28 → 1.6.6 View file →

		@@ -14,9 +14,9 @@
14	14	{
15	15	public static function getProductMenu($product, $echo = false, $activeMenu = '')
16	16	{
17	17	// Skip rendering menu when custom editor modal is open
18		- if (isset($_GET['custom-editor']) && $_GET['custom-editor'] == 'true') {
	18	+ if (App::request()->get('custom-editor') === 'true') {
19	19	return '';
20	20	}
21	21
22	22	if (!$product instanceof Product) {
		@@ -39,16 +39,8 @@
39	39	'product_integrations' => [
40	40	'label' => __('Integrations', 'fluent-cart'),
41	41	'link' => $baseUrl . 'products/' . $productId . '/integrations'
42	42	],
43		- // 'product_pricing' => [
44		- // 'label' => __('Pricing', 'fluent-cart'),
45		- // 'link' => $baseUrl . 'products/' . $productId . '/pricing'
46		- // ],
47		-// 'product_integrations' => [
48		-// 'label' => __('Integrations', 'fluent-cart'),
49		-// 'link' => $baseUrl . 'products/' . $productId . '/integrations'
50		-// ]
51	43	], [
52	44	'product_id' => $productId,
53	45	'base_url' => $baseUrl
54	46	]);
		@@ -53,9 +45,9 @@
53	45	'base_url' => $baseUrl
54	46	]);
55	47
56	48	$request = App::request()->all();
57		- if (isset($request['action']) && $request['action'] == 'edit') {
	49	+ if (isset($request['action']) && $request['action'] === 'edit') {
58	50	$menuItems['product_details'] = [
59	51	'label' => __('Edit Pricing', 'fluent-cart'),
60	52	'link' => admin_url('admin.php?page=fluent-cart#/products/' . $productId)
61	53	];
		@@ -72,13 +64,13 @@
72	64	'status' => $product->post_status,
73	65	'product_id' => $productId
74	66	];
75	67
76		- if ($echo) {
77		- App::make('view')->render('admin.admin_product_menu', $data);
78		- } else {
	68	+ if (!$echo) {
79	69	return (string)App::make('view')->make('admin.admin_product_menu', $data);
80	70	}
	71	+
	72	+ App::make('view')->render('admin.admin_product_menu', $data);
81	73	}
82	74
83	75	private static function getProductsMenu($baseUrl)
84	76	{
		@@ -87,19 +79,37 @@
87	79	'link' => $baseUrl . 'products',
88	80	'permission' => ['products/view']
89	81	];
90	82
	83	+ $children = [];
	84	+
	85	+ // The parent link is not reachable on touch (the tap opens the dropdown),
	86	+ // and the off-canvas menu renders children only — so list it as a child too.
	87	+ $children['all_products'] = [
	88	+ 'label' => __('All Products', 'fluent-cart'),
	89	+ 'link' => $baseUrl . 'products',
	90	+ 'permission' => ['products/view']
	91	+ ];
	92	+
	93	+ // Attributes power the advanced-variations feature.
	94	+ $children['product_attributes'] = [
	95	+ 'label' => __('Attributes', 'fluent-cart'),
	96	+ 'link' => $baseUrl . 'products/attributes',
	97	+ 'permission' => ['products/view']
	98	+ ];
	99	+
	100	+ // Inventory only when the advanced-inventory toggle is on.
91	101	if (ModuleSettings::isActive('stock_management') &&
92	102	ModuleSettings::getSettings('stock_management.enable_advanced_inventory') === 'yes') {
93		- $menu['children'] = [
94		- 'product_inventory' => [
95		- 'label' => __('Inventory', 'fluent-cart'),
96		- 'link' => $baseUrl . 'products/inventory',
97		- 'permission' => ['products/view']
98		- ]
	103	+ $children['product_inventory'] = [
	104	+ 'label' => __('Inventory', 'fluent-cart'),
	105	+ 'link' => $baseUrl . 'products/inventory',
	106	+ 'permission' => ['products/view']
99	107	];
100	108	}
101	109
	110	+ $menu['children'] = $children;
	111	+
102	112	return $menu;
103	113	}
104	114
105	115	public static function getAdminMenu($echo = false, $activeNav = '')
		@@ -105,19 +115,19 @@
105	115	public static function getAdminMenu($echo = false, $activeNav = '')
106	116	{
107	117	$menuItems = self::getMenuItems();
108	118
109		- if ($echo) {
110		- App::make('view')->render('admin.admin_menu', [
111		- 'menu_items' => $menuItems,
112		- 'active' => $activeNav
113		- ]);
114		- } else {
	119	+ if (!$echo) {
115	120	return App::make('view')->make('admin.admin_menu', [
116	121	'menu_items' => $menuItems,
117	122	'active' => $activeNav
118	123	]);
119	124	}
	125	+
	126	+ App::make('view')->render('admin.admin_menu', [
	127	+ 'menu_items' => $menuItems,
	128	+ 'active' => $activeNav
	129	+ ]);
120	130	}
121	131
122	132	public static function getMenuItems($withSettings = false)
123	133	{
		@@ -215,14 +225,6 @@
215	225	[],
216	226	FLUENTCART_VERSION,
217	227	);
218	228	}
219		-
220		-
221	229	}
222		-
223		-
224		-
225		-
226		-
227		-
228	230