Skip to content
This repository has been archived by the owner on Dec 21, 2021. It is now read-only.

Hotfix fixing issues #2

Merged
merged 30 commits into from
Apr 12, 2018
Merged

Hotfix fixing issues #2

merged 30 commits into from
Apr 12, 2018

Conversation

alecritson
Copy link
Contributor

No description provided.

@alecritson alecritson added the enhancement New feature or request label Apr 12, 2018
@alecritson alecritson self-assigned this Apr 12, 2018
@alecritson alecritson merged commit 853caac into dev Apr 12, 2018
@alecritson alecritson deleted the HOTFIX_Fixing-Issues branch April 12, 2018 11:38
alecritson added a commit that referenced this pull request Nov 30, 2018
* Updates

* Update

* Use own auth middleware for hub

* Hotfix fixing issues (#2)

* Refactoring

* Use Ziggy for route naming

* Product editing updates

* Use Ziggy route

* Remove dep component

* Redirec to hub index on login

* Resize logo

* Show order menu

* Add extra side nav bits

* Fix RT icons

* Fix placeholder img url

* Fixes to category listing

* Update navigation

* Remove debug

* Add active link for dashboard

* User detail editing

* Customer editing updates

* Add cols to orders

* Make order statuses dynamic

* Reference order mixin

* Allow custom CSS file

* Compile

* Editing customer addresses

* Compile

* Fixes

* Compile

* UI Improvements

* Update dashboard

* Remove bits we don’t need

* js url fix on login

* Squashed commit of the following:

commit f05246a
Author: Alec Ritson <alec@neondigital.co.uk>
Date:   Fri May 11 16:13:44 2018 +0100

    Create attributes

commit 9a7ecbf
Author: Alec Ritson <alec@neondigital.co.uk>
Date:   Fri May 4 14:40:00 2018 +0100

    Fix translations

commit 38342e2
Author: Alec Ritson <alec@neondigital.co.uk>
Date:   Thu Apr 19 17:11:02 2018 +0100

    Product family initial screens

commit f406eba
Author: Alec Ritson <alec@neondigital.co.uk>
Date:   Thu Apr 19 15:56:25 2018 +0100

    Initial Screens

commit ab0c94d
Author: Alec Ritson <alec@neondigital.co.uk>
Date:   Wed Apr 18 15:42:30 2018 +0100

    Attribute editing

* Squashed commit of the following:

commit 9069274
Author: Alec Ritson <alec@neondigital.co.uk>
Date:   Tue May 22 11:51:11 2018 +0100

    Pricing updates

commit 0e792c1
Author: Alec Ritson <alec@neondigital.co.uk>
Date:   Tue May 22 09:52:43 2018 +0100

    Price Input Component

commit 733b3e5
Author: Alec Ritson <alec@neondigital.co.uk>
Date:   Mon May 21 16:37:12 2018 +0100

    Add category tab back in

commit d591e65
Author: Alec Ritson <alec@neondigital.co.uk>
Date:   Mon May 21 16:37:05 2018 +0100

    Update order views

commit 0a1e071
Author: Alec Ritson <alec@neondigital.co.uk>
Date:   Fri May 11 16:16:24 2018 +0100

    Squashed commit of the following:

    commit ae80997
    Author: Alec Ritson <alec@neondigital.co.uk>
    Date:   Fri May 11 16:16:02 2018 +0100

        Squashed commit of the following:

        commit f05246a
        Author: Alec Ritson <alec@neondigital.co.uk>
        Date:   Fri May 11 16:13:44 2018 +0100

            Create attributes

        commit 9a7ecbf
        Author: Alec Ritson <alec@neondigital.co.uk>
        Date:   Fri May 4 14:40:00 2018 +0100

            Fix translations

        commit 38342e2
        Author: Alec Ritson <alec@neondigital.co.uk>
        Date:   Thu Apr 19 17:11:02 2018 +0100

            Product family initial screens

        commit f406eba
        Author: Alec Ritson <alec@neondigital.co.uk>
        Date:   Thu Apr 19 15:56:25 2018 +0100

            Initial Screens

        commit ab0c94d
        Author: Alec Ritson <alec@neondigital.co.uk>
        Date:   Wed Apr 18 15:42:30 2018 +0100

            Attribute editing

commit e05aafd
Author: Alec Ritson <alec@neondigital.co.uk>
Date:   Thu May 3 09:59:29 2018 +0100

    Build

commit 756356d
Author: Alec Ritson <alec@neondigital.co.uk>
Date:   Mon Apr 23 17:22:33 2018 +0100

    Update for order changes

commit 39cbec0
Author: Alec Ritson <alec@neondigital.co.uk>
Date:   Fri Apr 20 16:58:15 2018 +0100

    Update views for new schema

* Added extra inventory fields

* Added some base services

* Added some base services

* Sort uses

* Update pricing

* Order screen updates

* Show category attributes

* Show loading indicator

* Remove fake saved search

* Remove unused components

* Remove unused UI

* Fix placeholder url

* Fix search pagination

* Fix property references

* Fix property references

* Compile

* Show validation errors

* show validation errors better on attributes

* Remove clockwork

* Custom fields

* Added datepicker

* Added pikaday

* Initial layout saving (#4)

* Initial layout saving

* Apply fixes from StyleCI (#5)

* Compile assets

* Update passport

* Added config to change routes

* Fixed no-image url

* Use page instead of current_page

* Show delivery zone

* Show discounts and rejig table

* Bulk updates

* Updates to order status handling

* Minify!

* Add sweet jar image

* Reset page on search

* Show email on order table

* Changed layout to be closer to invoice

* Added customer reference and order notes

* Date range picker and better status select

* Compile

* Account for orders without shipping

* Use query string on filters

* Allow null initial date

* Refresh input value

* Use correct link to customer page

* Updates to daterangepicker

* Build

* Filter by shipping zone

* Highlight row when selected

* Select all

* User account no

* Compile

* Make table row highlighting more distinct

* Fix order invoice

* Fix invoice link

* Get some figures showing

* Show ID/Reference in table

* Get password resets working

* Add table-responsive

* Min width on content

* Remove viewport scaling for now

* Compile

* Change back to original calculation

* Build

* Page titles

* Page title

* Show account no

* Bg color whole tr

* Show status update modal

* Show feedback on bulk save

* Handle preview errors

* Show status on order edit

* Stop content jump

* Make sure we reset the dirty fields

* override tab method

* Compile

* Show fraud info

* Update titles

* Show display id

* Swap title format

* All follow same update process

* Reset page when searching

* Show correct order status styles

* Show display id and reference

* Style iframe

* Refund improvements

* increase z-index

* Fix title prefix

* compile

* Updates to refunds

* Rearrange transaction table

* Make button inline

* Compile

* Fixes to transaction refunds

* Compile

* Change transaction table header

* Compile

* Added jpeg icon

* use order total from db

* Add jpeg file icon

* Removed unused JS file on login

* Remove rollbar

* Fixed missing package, which caused npm to fail

* Fixes to delete redirect

* removed typo

* Fixed broken url's

* Fixed account number issue

* Fix prop errors

* Bump

* Clean up and fix attribute group label

* Clean up

* Init

* Compile

* Show categories within category view

* Improvements to UI

* Add has attributes

* Add category node component

* Minify!

* Allow product association

* Add product attaching to category edit

* Added components

* Compile

* Show products on category listing

* Pass up order id

* Updates to collections and products

* Editing product families

* Show attribute groups

* Compile production

* Update customer details editing

* Updates to impersonation

* Compile

* Hopefully stop the division by zero

* Remove extra columns

* Change status label

* Compile production

* Filter by order type
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants