Merge branch 'staging' of https://git.02pg.com/pardeep01s/power into staging

f3144355 · mohd zamin · 8760eff9 · 9f886480 · f3144355 · f3144355
Commit f3144355 authored 3 years ago by mohd zamin
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

.gitlab-ci.yml .gitlab-ci.yml +1 -1

app/Http/Controllers/HomeController.php app/Http/Controllers/HomeController.php +4 -1

No files found.
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,7 +30,7 @@ build:
    - cp -R /home/devzr01s/public_html/powertech/staging/public /home/devzr01s/public_html/powertech/backup/public
    - cd ..
    - rm -rf /home/devzr01s/public_html/powertech/staging
-    - cp -R powertech /home/devzr01s/public_html/powertech/staging
+    - cp -R power /home/devzr01s/public_html/powertech/staging
    - cp -R /home/devzr01s/public_html/powertech/backup/public /home/devzr01s/public_html/powertech/staging
    - cd /home/devzr01s/public_html/powertech/staging
    - pwd

--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -154,7 +154,10 @@ class HomeController extends Controller
            }
            else
            {
-                $res = "<option value=''>No district found</option>";
+                $treatment = $treat['treatment'];
+                $id = $treat['id'];
+                $res .= "<option value='$id'>$treatment</option>";
+                
            }
            return $res;
        }