15313670163 2 mesi fa
parent
commit
faf4608dbb
1 ha cambiato i file con 5 aggiunte e 2 eliminazioni
  1. 5 2
      app/Controller/WebsiteController.php

+ 5 - 2
app/Controller/WebsiteController.php

@@ -1160,7 +1160,12 @@ class WebsiteController extends AbstractController
      * @return array
      * @return array
      */
      */
 
 
+<<<<<<< HEAD
     public function  addWebsiteTemplateintel(){
     public function  addWebsiteTemplateintel(){
+=======
+    public function addWebsiteTemplateintel()
+    {
+>>>>>>> 20241216_fr_diyweb
         $requireData = $this->request->all();
         $requireData = $this->request->all();
         $validator = $this->validationFactory->make(
         $validator = $this->validationFactory->make(
             $requireData,
             $requireData,
@@ -1259,7 +1264,6 @@ class WebsiteController extends AbstractController
      */
      */
 
 
     public function upWebsiteTemplateintel()
     public function upWebsiteTemplateintel()
-
     {
     {
         $requireData = $this->request->all();
         $requireData = $this->request->all();
         $validationRules = [
         $validationRules = [
@@ -1310,7 +1314,6 @@ class WebsiteController extends AbstractController
         }
         }
         $result = $this->websiteServiceClient->upWebsiteTemplateintel($requireData);
         $result = $this->websiteServiceClient->upWebsiteTemplateintel($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
-
     }
     }
 
 
     /**
     /**