merge

Presentation/Nop.Web/App_Data/appsettings.json

@@ -1,10 +1,10 @@
 {
-    "ConnectionStrings": {
-        "ConnectionString": "Data Source=100.73.220.50;Initial Catalog=FruitBank_PROD;Integrated Security=False;Persist Security Info=False;User ID=sa;Password=v6f_?xNfg9N1;Trust Server Certificate=True",
-        "DataProvider": "sqlserver",
-        "SQLCommandTimeout": null,
-        "WithNoLock": false
-    },
+  "ConnectionStrings": {
+    "ConnectionString": "Data Source=100.73.220.50;Initial Catalog=FruitBank_PROD;Integrated Security=False;Persist Security Info=False;User ID=sa;Password=v6f_?xNfg9N1;Trust Server Certificate=True",
+    "DataProvider": "sqlserver",
+    "SQLCommandTimeout": null,
+    "WithNoLock": false
+  },
   "AzureBlobConfig": {
     "ConnectionString": null,
     "ContainerName": null,
@@ -64,7 +64,7 @@
     "CssBundleSuffix": ".styles",
     "EnableCaching": true,
     "EnableMemoryCache": true,
-    "EnableDiskCache": false,
+    "EnableDiskCache": true,
     "CacheDirectory": "\\Presentation\\Nop.Web\\wwwroot\\bundles",
     "EnableTagHelperBundling": false,
     "CdnUrl": "",

Presentation/Nop.Web/Nop.Web.csproj

@@ -51,6 +51,48 @@
     <None Include="appsettings.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="Plugins\Misc.FruitBankPlugin\runtimes\linux-arm64\native\libHarfBuzzSharp.so" />
+    <None Include="Plugins\Misc.FruitBankPlugin\runtimes\linux-arm64\native\libpdfium.so" />
+    <None Include="Plugins\Misc.FruitBankPlugin\runtimes\linux-arm64\native\libSkiaSharp.so" />
+    <None Include="Plugins\Misc.FruitBankPlugin\runtimes\linux-arm\native\libHarfBuzzSharp.so" />
+    <None Include="Plugins\Misc.FruitBankPlugin\runtimes\linux-arm\native\libpdfium.so" />
+    <None Include="Plugins\Misc.FruitBankPlugin\runtimes\linux-arm\native\libSkiaSharp.so" />
+    <None Include="Plugins\Misc.FruitBankPlugin\runtimes\linux-musl-arm64\native\libpdfium.so" />
+    <None Include="Plugins\Misc.FruitBankPlugin\runtimes\linux-musl-x64\native\libHarfBuzzSharp.so" />
+    <None Include="Plugins\Misc.FruitBankPlugin\runtimes\linux-musl-x64\native\libpdfium.so" />
+    <None Include="Plugins\Misc.FruitBankPlugin\runtimes\linux-musl-x64\native\libSkiaSharp.so" />
+    <None Include="Plugins\Misc.FruitBankPlugin\runtimes\linux-musl-x64\native\Magick.Native-Q16-x64.dll.so" />
+    <None Include="Plugins\Misc.FruitBankPlugin\runtimes\linux-musl-x86\native\libpdfium.so" />
+    <None Include="Plugins\Misc.FruitBankPlugin\runtimes\linux-x64\native\libHarfBuzzSharp.so" />
+    <None Include="Plugins\Misc.FruitBankPlugin\runtimes\linux-x64\native\libpdfium.so" />
+    <None Include="Plugins\Misc.FruitBankPlugin\runtimes\linux-x64\native\libSkiaSharp.so" />
+    <None Include="Plugins\Misc.FruitBankPlugin\runtimes\linux-x64\native\Magick.Native-Q16-x64.dll.so" />
+    <None Include="Plugins\Misc.FruitBankPlugin\runtimes\linux-x86\native\libpdfium.so" />
+    <None Include="Plugins\Misc.FruitBankPlugin\runtimes\osx-arm64\native\libpdfium.dylib" />
+    <None Include="Plugins\Misc.FruitBankPlugin\runtimes\osx-x64\native\libpdfium.dylib" />
+    <None Include="Plugins\Misc.FruitBankPlugin\runtimes\osx-x64\native\Magick.Native-Q16-x64.dll.dylib" />
+    <None Include="Plugins\Misc.FruitBankPlugin\runtimes\osx\native\libHarfBuzzSharp.dylib" />
+    <None Include="Plugins\Misc.FruitBankPlugin\runtimes\osx\native\libSkiaSharp.dylib" />
+    <None Include="Plugins\Misc.FruitBankPlugin\runtimes\unix\lib\net8.0\Microsoft.Data.SqlClient.dll" />
+    <None Include="Plugins\Misc.FruitBankPlugin\runtimes\win-arm64\native\libHarfBuzzSharp.dll" />
+    <None Include="Plugins\Misc.FruitBankPlugin\runtimes\win-arm64\native\libSkiaSharp.dll" />
+    <None Include="Plugins\Misc.FruitBankPlugin\runtimes\win-arm64\native\Microsoft.Data.SqlClient.SNI.dll" />
+    <None Include="Plugins\Misc.FruitBankPlugin\runtimes\win-arm64\native\pdfium.dll" />
+    <None Include="Plugins\Misc.FruitBankPlugin\runtimes\win-arm\native\Microsoft.Data.SqlClient.SNI.dll" />
+    <None Include="Plugins\Misc.FruitBankPlugin\runtimes\win-x64\native\libHarfBuzzSharp.dll" />
+    <None Include="Plugins\Misc.FruitBankPlugin\runtimes\win-x64\native\libSkiaSharp.dll" />
+    <None Include="Plugins\Misc.FruitBankPlugin\runtimes\win-x64\native\Magick.Native-Q16-x64.dll" />
+    <None Include="Plugins\Misc.FruitBankPlugin\runtimes\win-x64\native\Microsoft.Data.SqlClient.SNI.dll" />
+    <None Include="Plugins\Misc.FruitBankPlugin\runtimes\win-x64\native\pdfium.dll" />
+    <None Include="Plugins\Misc.FruitBankPlugin\runtimes\win-x86\native\libHarfBuzzSharp.dll" />
+    <None Include="Plugins\Misc.FruitBankPlugin\runtimes\win-x86\native\libSkiaSharp.dll" />
+    <None Include="Plugins\Misc.FruitBankPlugin\runtimes\win-x86\native\Microsoft.Data.SqlClient.SNI.dll" />
+    <None Include="Plugins\Misc.FruitBankPlugin\runtimes\win-x86\native\pdfium.dll" />
+    <None Include="Plugins\Misc.FruitBankPlugin\runtimes\win\lib\net7.0\System.Management.dll" />
+    <None Include="Plugins\Misc.FruitBankPlugin\runtimes\win\lib\net8.0\Microsoft.Data.SqlClient.dll" />
+    <None Include="Plugins\Misc.FruitBankPlugin\runtimes\win\lib\net8.0\Microsoft.Win32.SystemEvents.dll" />
+    <None Include="Plugins\Misc.FruitBankPlugin\runtimes\win\lib\net8.0\System.Runtime.Caching.dll" />
+    <None Include="Plugins\Misc.FruitBankPlugin\runtimes\win\lib\net9.0\System.Diagnostics.EventLog.dll" />
     <PackageReference Include="DevExpress.AspNetCore.Common" Version="25.1.3" />
     <PackageReference Include="DevExtreme.AspNet.Core" Version="25.1.3" />
     <PackageReference Include="DevExtreme.AspNet.Data" Version="5.1.0" />

Presentation/Nop.Web/Themes/CarHaven/Content/css/quick-order-menu.css

@@ -0,0 +1,27 @@
+
+/* ── Quick Order nav item ─────────────────────────────────────────────────── */
+.top-menu .quick-order-menu-item > a {
+    color: #f4a236 !important;
+    font-weight: 700;
+}
+
+.top-menu .quick-order-menu-item > a .fa {
+    margin-right: 4px;
+}
+
+.top-menu .quick-order-menu-item > a:hover {
+    color: #fff !important;
+    background-color: #f4a236;
+    border-radius: 6px;
+    padding-left: 10px;
+    padding-right: 10px;
+}
+
+/* Preorder item — teal accent to distinguish from Quick Order */
+.top-menu .preorder-menu-item > a {
+    color: #2d9e9e !important;
+}
+
+.top-menu .preorder-menu-item > a:hover {
+    background-color: #2d9e9e;
+}

Presentation/Nop.Web/Themes/CarHaven/Content/css/styles.css

@@ -7742,10 +7742,10 @@ html.lenis, html.lenis body {
   color: var(--text-muted);
 }
 
-/* 3×2 grid */
+/* 4×2 grid */
 .fb-cat-grid {
   display: grid;
-  grid-template-columns: repeat(3, 1fr);
+  grid-template-columns: repeat(4, 1fr);
   gap: 20px;
   max-width: 1600px;
   margin: 0 auto;
@@ -7875,8 +7875,15 @@ html.lenis, html.lenis body {
   transform: translateY(-50%);
 }
 
+/* Smaller desktop: 3 columns */
+@media (max-width: 1280px) {
+  .fb-cat-grid {
+    grid-template-columns: repeat(3, 1fr);
+  }
+}
+
 /* Tablet: 2 columns */
-@media (max-width: 1024px) {
+@media (max-width: 900px) {
   .fb-cat-grid {
     grid-template-columns: repeat(2, 1fr);
     gap: 16px;