Commit Graph

163 Commits

Author SHA1 Message Date
Unchained d4039c6e3b feat(analytics): complete Rybbit tracking integration
Build and Deploy / build (push) Has been cancelled
- Add Rybbit server-side tracking to analytics-server.ts for order completion and revenue
- Add trackNewsletterSignup to analytics.ts and wire up NewsletterSection
- Add cart tracking to CartDrawer (cart view, remove from cart)
- All ecommerce events now track to both OpenPanel and Rybbit
2026-03-31 05:53:53 +02:00
Unchained 56c05cc8fc feat(analytics): add Rybbit proxy rewrites and env vars
Build and Deploy / build (push) Has been cancelled
- Add Next.js rewrites to proxy /api/script.js and /api/track through self-hosted Rybbit
- This bypasses ad blockers that would block rybbit.nodecrew.me directly
- Add NEXT_PUBLIC_RYBBIT_HOST and NEXT_PUBLIC_RYBBIT_SITE_ID env vars to K8s deployment
2026-03-31 05:17:57 +02:00
Unchained 511c3078c5 fix: update all fallback URLs from dev.manoonoils.com to manoonoils.com
Build and Deploy / build (push) Has been cancelled
2026-03-31 00:53:37 +02:00
Unchained 44091fc72a fix: inline Rybbit config to avoid client directive in server component
Build and Deploy / build (push) Has been cancelled
2026-03-31 00:50:33 +02:00
Unchained b3efebd3e4 feat: integrate Rybbit analytics alongside OpenPanel
Build and Deploy / build (push) Has been cancelled
- Add RybbitService for tracking e-commerce events
- Update useAnalytics hook to track with both OpenPanel and Rybbit
- Add Rybbit script to layout for page view tracking
- Track all applicable store events: product views, cart, checkout, orders, search, etc.
2026-03-31 00:38:38 +02:00
Unchained 044aefae94 fix: remove dev.manoonoils.com from ingress and update OpenPanel API URL
Build and Deploy / build (push) Has been cancelled
- Remove dev.manoonoils.com from storefront ingress to prevent cross-domain tracking issues
- Use environment variable for OpenPanel API URL in route handler
- Fixes session state conflicts from multiple domains
2026-03-30 20:40:17 +02:00
Unchained f1c30b7141 fix: replace {{productName}} template in product page keywords
Build and Deploy / build (push) Has been cancelled
- Add template replacement logic for product keywords
- Replace {{productName}} with actual product.name
- Keywords now show correct product name instead of template variable
2026-03-30 13:07:40 +02:00
Unchained d9473e3f9e fix: add missing SEO to About and Contact pages
- Add keywords, canonical, OpenGraph to About page
- Refactor Contact page to server component with generateMetadata
- Create ContactPageClient for form functionality
- All pages now have complete SEO coverage
2026-03-30 12:21:26 +02:00
Unchained ba4da3287d fix: JSON-LD schema rendering in SSR
- Remove next/script dependency causing SSR issues
- Use regular script tag for server-side rendering
- Add real SEO verification test that checks rendered output
- All 7/7 SEO checks now passing
2026-03-30 11:55:21 +02:00
Unchained fd0490c3e1 feat: integrate SEO system into pages
- Add OrganizationSchema to root layout
- Add ProductSchema with metadata to product pages
- Add enhanced metadata to homepage with keywords
- Add enhanced metadata to products listing page
- Add noindex to checkout page via layout
- Implement canonical URLs, OpenGraph, and Twitter cards
2026-03-30 11:42:58 +02:00
Unchained 234b1f1739 feat: comprehensive SEO system with keywords and schema markup
- Add 4-locale keyword configurations (SR, EN, DE, FR)
- Create schema generators (Product, Organization, Breadcrumb)
- Add React components for JSON-LD rendering
- Implement caching for keyword performance
- Abstract all SEO logic for maintainability
2026-03-30 11:22:44 +02:00
Unchained 25e60457cc fix: shipping cost calculation and performance optimization
- Fix shipping cost not included in checkout total
- Add useShippingMethodSelector hook for proper abstraction
- Remove blocking initCheckout from Header for better performance
- Checkout now initializes lazily when cart opens or item added
2026-03-30 06:31:52 +02:00
Unchained adb28c2a91 feat: Implement dual client/server analytics tracking
Complete analytics overhaul with redundant tracking:

CLIENT-SIDE (useAnalytics hook):
- Tracks user behavior in real-time
- Product views, add to cart, checkout steps
- Revenue tracking via op.revenue()
- Captures user session data

SERVER-SIDE (API route + server functions):
- POST /api/analytics/track-order endpoint
- trackOrderCompletedServer() function
- Reliable tracking that can't be blocked
- Works even if browser closes

DUAL TRACKING for order completion:
1. Client tracks immediately (session data)
2. API call to server endpoint (reliable)
3. Both sources recorded with 'source' property

Files:
- src/lib/analytics.ts - Client-side with dual tracking
- src/lib/analytics-server.ts - Server-side tracking
- src/app/api/analytics/track-order/route.ts - API endpoint

Benefits:
-  100% revenue capture (server-side backup)
-  Real-time client tracking
-  Ad blocker resistant
-  Browser-close resistant
-  Full funnel visibility
2026-03-30 05:41:05 +02:00
Unchained 6ae7b045a7 fix: Track order completion BEFORE clearing checkout
The checkout was being cleared before tracking, causing getTotal()
to return 0. Fixed by reordering operations:
1. Track order completion (while checkout data exists)
2. Then clear the checkout

Added console log to verify total is captured correctly.
2026-03-30 05:02:34 +02:00
Unchained 05b0a64c84 debug: Add console logging for revenue tracking
Add detailed console logs to debug why revenue tracking isn't working:
- Log when trackOrderCompleted is called
- Log revenue amount and currency
- Log success/failure of revenue tracking

This will help identify if the issue is with the op.revenue() call
or if it's failing silently.
2026-03-29 20:52:21 +02:00
Unchained a516b3a536 fix: Remove auto-order confirmation code
The order confirmation requires MANAGE_ORDERS permission which
the storefront API token doesn't have. Removing the auto-confirmation
attempt to prevent console errors. Orders will remain UNCONFIRMED
until manually confirmed in Saleor Dashboard.
2026-03-29 20:49:52 +02:00
Unchained aa737a1449 fix: Simplify analytics to fix OpenPanel errors
Remove complex tracking implementation that was causing errors:
- Remove op.increment/decrement calls (causing Duplicate event errors)
- Remove complex type definitions
- Remove unused tracking methods
- Keep only essential tracking with proper error handling

This reverts to a simpler, working analytics implementation.
2026-03-29 20:41:27 +02:00
Unchained 51a41cbb89 fix: Add missing currency field to checkout items tracking
CartItemData requires currency field for each item.
Added currency extraction from variant pricing.
2026-03-29 20:31:57 +02:00
Unchained 3c3f4129c8 feat: Implement comprehensive OpenPanel analytics tracking
Complete analytics overhaul with 30+ tracking events:

E-commerce Events:
- Product views, image views, variant selection
- Add/remove from cart, quantity changes
- Cart open and abandonment tracking
- Checkout funnel (all steps)
- Payment/shipping method selection
- Order completion with revenue tracking

User Engagement:
- Search queries with filters
- CTA clicks, external link clicks
- Element engagement (click/hover/view)
- Newsletter signups
- Promo code usage
- Wishlist actions

User Identity:
- User identification
- Property setting
- Screen/session tracking

Technical:
- Proper TypeScript types for all events
- Increment/decrement counters
- Pending revenue for cart abandonment
- Comprehensive error handling

Includes complete documentation in docs/ANALYTICS_GUIDE.md
2026-03-29 20:25:21 +02:00
Unchained 038a574c6e feat: Increase free shipping threshold from 3000 to 10000 RSD
Update free shipping minimum from 3,000 RSD to 10,000 RSD across:
- TickerBar component
- English translations (en.json)
- Serbian translations (sr.json)
- French translations (fr.json)
- German translations (de.json)
2026-03-29 19:47:26 +02:00
Unchained de4eb0852c feat: Add order auto-confirmation (best effort)
Added order confirmation after checkout completion.
Note: This requires MANAGE_ORDERS permission which currently
has the same bug as HANDLE_PAYMENTS. The try-catch ensures
checkout won't fail if confirmation fails. Orders will be
UNCONFIRMED until manually confirmed in dashboard.
2026-03-29 19:33:04 +02:00
Unchained 9c3d8b0d11 fix: Remove COD transaction creation to fix checkout errors
The transaction creation was failing due to HANDLE_PAYMENTS permission issues.
Removed the code to get checkout working again. Will implement via
order metadata or core-extensions webhook instead.
2026-03-29 19:17:06 +02:00
Unchained e15e6470d2 fix: Add SALEOR_API_TOKEN auth for COD transaction creation
- Add SALEOR_API_TOKEN environment variable support
- Update Apollo client to include auth header
- Enable COD transaction creation after checkout
2026-03-29 18:22:16 +02:00
Unchained 5f9b7bac3a fix: set checkout languageCode to ensure emails are sent in correct language
- Add CHECKOUT_LANGUAGE_CODE_UPDATE mutation to update checkout language
- Call language code update before completing checkout
- Language code (SR, EN, DE, FR) is now set on checkout before order creation
- This ensures order confirmation emails are sent in the customer's language
- Update step numbering in checkout flow (now 6 steps total)
2026-03-29 14:42:52 +02:00
Unchained fbe0761609 fix: remove manual transaction creation causing 400 error
- Remove CREATE_TRANSACTION_MUTATION call that's causing 400 error
- Saleor's checkoutComplete already creates order with NOT_CHARGED status for COD
- Order doesn't need manual transaction - staff handles fulfillment in dashboard
- Keep payment method selection and UI components intact
2026-03-29 14:31:42 +02:00
Unchained 10b18c6010 feat: add 30-day money back guarantee trust badge above complete order button
- Add green trust badge with checkmark icon above 'Complete Order' button
- Add translations for all locales (EN, SR, DE, FR)
- Badge includes: '30-Day Money-Back Guarantee' text
- Styled with green background and border to match trust/conversion theme
2026-03-29 14:27:05 +02:00
Unchained eaf599f248 style: improve COD payment card selected state
- Add black border-2 and shadow when selected
- Change icon background to black with white icon when selected
- Add 'Selected' badge with checkmark icon
- Make text bolder and more visible when selected
- Add hover shadow effects
- Add 'selected' translation key for all locales
- Overall more lively and prominent selected state
2026-03-29 09:06:29 +02:00
Unchained 82c23e37a1 fix: use lowercase 'cod' in CODInstructions translation key
- Change useTranslations from Payment.COD to Payment.cod
- Fixes MISSING_MESSAGE error in CODInstructions component
- Consistent with translation file structure
2026-03-29 08:59:59 +02:00
Unchained 3e7ac79cf4 fix: use lowercase 'cod' for translation keys to match method ID
- Change translation keys from COD to cod in all locale files
- Fixes MISSING_MESSAGE error in PaymentMethodCard
- Aligns translation keys with payment method IDs
2026-03-29 08:57:59 +02:00
Unchained 0a87cdc347 fix: translate payment method names based on locale
- Update PaymentMethodCard to use next-intl translations
- Remove hardcoded English names from config
- Add comingSoon translation key for unavailable methods
- Payment names now match checkout language (SR/EN/DE/FR)
2026-03-29 08:55:20 +02:00
Unchained ff481f18c3 feat: implement Cash on Delivery (COD) payment method
This commit adds comprehensive COD support using Saleor's native Transaction system:

**Architecture:**
- Uses Saleor's native Transaction objects (not metadata)
- Modular payment method configuration
- Extensible design for future payment types (cards, bank transfer, etc.)

**New Components:**
- PaymentMethodSelector: Reusable payment method selection UI
- PaymentMethodCard: Individual payment method card
- CODInstructions: COD-specific instructions and guidance
- PaymentSection: Checkout integration wrapper

**Core Features:**
- COD selected by default for Serbia (default-channel)
- Transaction created automatically on order completion
- Transaction visible in Saleor Dashboard
- Multi-language support (EN, SR, DE, FR)
- No additional fees
- Instructions shown to customer (prepare cash, inspect order, no fee)

**Files Added:**
- docs/COD-IMPLEMENTATION-PLAN.md
- src/lib/config/paymentMethods.ts
- src/lib/saleor/payments/types.ts
- src/lib/saleor/payments/cod.ts
- src/components/payment/PaymentMethodSelector.tsx
- src/components/payment/PaymentMethodCard.tsx
- src/components/payment/CODInstructions.tsx
- src/components/payment/index.ts
- src/app/[locale]/checkout/components/PaymentSection.tsx

**Files Modified:**
- src/app/[locale]/checkout/page.tsx (added payment section, transaction creation)
- src/i18n/messages/{en,sr,de,fr}.json (payment translations)

**Technical Details:**
- Transaction status: NOT_CHARGED
- Available actions: [CHARGE]
- PSP Reference format: COD-{orderNumber}-{timestamp}
- Staff collects cash and fulfills order via Dashboard

Closes: Cash on Delivery payment implementation
2026-03-29 06:02:51 +02:00
Unchained 7d63f4fbcd fix: add missing useRef import 2026-03-28 18:44:07 +02:00
Unchained b78b081d29 fix: use ref instead of state for initialization flag to prevent dependency array size change 2026-03-28 18:41:36 +02:00
Unchained 676dda4642 fix: set language code in CartDrawer before init 2026-03-28 18:20:12 +02:00
Unchained c8d184f9dc fix: set language code before initializing checkout 2026-03-28 18:18:52 +02:00
Unchained 322c4c805b fix: add back email update step in checkout 2026-03-28 18:09:57 +02:00
Unchained bcf74e1fd1 feat: implement one-page checkout with dynamic shipping 2026-03-28 18:03:12 +02:00
Unchained ca363a2406 fix: set language code before add to cart
Build and Deploy / build (push) Has been cancelled
Ensure language code is set in checkout store before creating checkout.
This ensures orders created from any page will have correct language.

- Add setLanguageCode to NewHero before addLine
- Add setLanguageCode to ProductDetail before addLine
- Uses current locale from useLocale or props
2026-03-28 12:53:14 +02:00
Unchained 5ec0e6c92c feat: set checkout languageCode based on user locale
Build and Deploy / build (push) Has been cancelled
- Add languageCode to checkout store state
- Add setLanguageCode action to store
- Pass languageCode when creating checkout
- Header component sets language code from useLocale hook
- Enables multi-language order confirmation emails
2026-03-28 12:31:34 +02:00
Unchained a419337d99 feat: store userLanguage in checkout metadata for multi-language emails
Adds userLanguage and userLocale to checkout metadata during order completion.
This allows N8N workflows to detect the customer's selected language and
send order confirmation emails in the correct language (sr, en, de, fr).
2026-03-28 07:27:09 +02:00
Unchained 09294fd752 refactor: Remove email functionality - migrated to core-extensions app
Removed:
- Webhook handlers (src/app/api/webhooks/saleor/)
- Email templates (src/emails/)
- OrderNotificationService (src/lib/services/)

Emails now handled by saleor-core-extensions service
Manifest: https://core-extensions.manoonoils.com/api/manifest
2026-03-26 08:50:58 +02:00
Unchained 85e41bfcc4 fix(tests): Fix all failing test cases in OrderNotificationService and AnalyticsService
Build and Deploy / build (push) Has been cancelled
- Fixed OrderNotificationService tests by removing React element prop assertions
- Updated admin email tests to match actual function signatures
- Fixed AnalyticsService test hoisting issue with vi.hoisted()
- Exported AnalyticsService class for test instantiation
- Converted require() to dynamic import() in singleton test
- All 49 tests now passing
- Coverage: 88% statements, 90% functions, 89% lines, 67% branches
2026-03-25 21:27:20 +02:00
Unchained 84b85f5291 test: comprehensive test suite for Manoon storefront
Add complete testing infrastructure with Vitest:

Testing Stack:
- Vitest for unit/integration tests
- @testing-library/react for component tests
- @playwright/test for E2E (installed, ready to configure)
- MSW for API mocking

Test Coverage:
1. Webhook Handler Tests (src/__tests__/integration/api/webhooks/saleor.test.ts)
   - ORDER_CONFIRMED: Emails + analytics
   - ORDER_CREATED: No duplicates
   - ORDER_FULFILLED: Tracking info
   - ORDER_CANCELLED: Cancellation reason
   - ORDER_FULLY_PAID: Payment confirmation
   - Error handling (400/500 responses)
   - Currency handling (RSD preservation)

2. OrderNotificationService Tests
   - Email sending in all 4 languages (SR, EN, DE, FR)
   - Price formatting verification
   - Admin vs Customer templates
   - Address formatting
   - Tracking info handling

3. AnalyticsService Tests
   - Revenue tracking with correct currency
   - Duplicate prevention verification
   - Error handling (doesn't break flow)
   - Singleton pattern

4. Utility Tests
   - formatPrice: RSD, EUR, USD formatting
   - Decimal and zero handling

Fixtures:
- Realistic order data in src/__tests__/fixtures/orders.ts
- Multiple scenarios (with tracking, cancelled, etc.)

Scripts:
- npm test: Run tests in watch mode
- npm run test:run: Run once
- npm run test:coverage: Generate coverage report
- npm run test:e2e: Run Playwright tests

Coverage target: 80%+ for critical paths
2026-03-25 21:07:47 +02:00
Unchained 4a63098e3e chore(analytics): add logging to verify currency being sent
Add console.log to trackRevenue to verify what currency code
is being sent to OpenPanel for debugging USD display issue.
2026-03-25 20:36:40 +02:00
Unchained 2e6668ff0d fix(webhook): prevent duplicate revenue tracking
Move analytics tracking inside ORDER_CONFIRMED conditional block
so revenue is only tracked once when order is confirmed, not twice
(once for ORDER_CREATED and once for ORDER_CONFIRMED).
2026-03-25 20:35:39 +02:00
Unchained ab7dfbe48b refactor(webhook): modularize email and analytics code
Create service-oriented architecture for better maintainability:

- AnalyticsService: Centralized analytics tracking with OpenPanel
  - trackOrderReceived(), trackRevenue(), track()
  - Error handling that doesn't break main flow
  - Singleton pattern for single instance

- OrderNotificationService: Encapsulates all order email logic
  - sendOrderConfirmation() - customer + admin
  - sendOrderShipped() - with tracking info
  - sendOrderCancelled() - with reason
  - sendOrderPaid() - payment confirmation
  - Translation logic moved from webhook to service
  - Email formatting utilities encapsulated

- Webhook route refactored:
  - Reduced from 605 lines to ~250 lines
  - No business logic - only HTTP handling
  - Delegates to services for emails and analytics
  - Cleaner separation of concerns

- New utils file: formatPrice() shared between services

This prevents future bugs by:
1. Centralizing email logic in one place
2. Making code testable (services can be unit tested)
3. Easier to add new webhook handlers
4. Translation logic not mixed with HTTP code
5. Analytics failures don't break order processing
2026-03-25 20:22:55 +02:00
Unchained 646d057970 Merge branch 'feature/saleor-emails' into dev 2026-03-25 19:58:17 +02:00
Unchained a0fa0f5401 fix(analytics): add OpenPanel revenue tracking to webhooks
Add OpenPanel import and initialization that was missing from webhook route.
Add order_received and revenue tracking when orders are confirmed.
Revenue tracking uses op.revenue() method with amount, currency,
order_id, and order_number properties.
2026-03-25 19:57:43 +02:00
Unchained aa7a0ed3c8 fix(webhook): remove incorrect /100 division from formatPrice
Saleor stores amounts as actual currency values (e.g., 5479 RSD),
not as cents (e.g., 547900). The formatPrice function was incorrectly
dividing by 100, causing prices like 5479 RSD to display as 55 RSD.
2026-03-25 19:53:08 +02:00
Unchained 15a65758d7 fix(webhook): remove incorrect /100 division from formatPrice
Saleor stores amounts as actual currency values (e.g., 5479 RSD),
not as cents (e.g., 547900). The formatPrice function was incorrectly
dividing by 100, causing prices like 5479 RSD to display as 55 RSD.
2026-03-25 19:51:27 +02:00